[Mailman-i18n] Help with Latest changes
Barry A. Warsaw
Tue Oct 29 22:10:43 2002
>>>>> "DT" == Danny Terweij <firstname.lastname@example.org> writes:
DT> Okay, so i must just edit the mailman.po file at the cvs
DT> location? Then my edit's and the new cvs chanhes are merged?
Usually, yes. Once in a while you'll get conflicts that have to be
manually resolved, but for this file, that should be extremely rare.
DT> Damn.. that's easy :) I am windows euh.. Microshit minded :)
I agree, that's a problem. :)
DT> Okay, then i loose my latest changes and start over :)
Maybe not! Just move your file back into its cvs location and do
another cvs update. See if cvs can do the merge.