On 01/03/2012 03:46 AM, Jürgen Spitzmüller wrote:
Wolfgang Engelmann wrote:what is recommended to do if during a svn update of LyX a conflict in »po/xxx.po« is detected?Just delete the affected files (including the .rej etc. files) and update again.
Or just do: svn revert po/*.po.
Richard
