Re: commit problem

[Christian Perrier <bubulle@debian.org>]

Quoting Arash Bijanzadeh (arashbi@gmail.com):
> TRying to commit fa.po I got:
> as@sky:~/po$ svn commit
> svn: Commit failed (details follow):
> svn: Aborting commit: '/home/as/po/fa.po' remains in conflict

I suggest you move your local fa.po file as fa-new.po, then do "svn
up". It will bring the SVN copy of fa.po

Then you can merge both:

msgmerge -U fa-new.po fa.po

Edit again fa-new.po to complete it...rename it to fa.po and commit back

> 
> I reviewed the file and solved every conflict I found. How can I get read of
> this message?
> 
> 
> --
> Abandon the search for Truth; settle for a good fantasy.

--