Re: erratic commit records?

[Sven Neumann <sven gimp org>]

Hi,

Shaun McCance <shaunm gmail com> writes:

> If this happens, you need to resolve the conflicts manually.
> This can be a real pain in the ass sometimes.

If there are conflicts in a po file and you happen to have your edited
version before cvs merged in the changes done in the repository, don't
even try to resolve conflicts manually. Instead, remove the file with
conflicts, cvs update again to get the version that's in CVS. Then,
use msgmerge to merge the two files.


Sven