Conflicting ChangeLogs (was: Re: Documentation: Editing the ChangeLog file with emacs

[Clytie Siddall <clytie riverland net au>]

Speaking of ChangeLogs, I've come across quite a few recently which  
have needed reconciling: I update the ChangeLog, and CVS tells me  
it's tried to merge the differences, but is giving up with a  
headache, so it passes the headache on to me. ;)

I don't mind doing this occasionally, but I've had to do it too many  
times recently. It can take a while, with large differences.

I think it's nearly always (or always) been Gnome-2-14 modules'  
ChangeLogs.

Is there any reason why so many ChangeLogs would have major  
conflicts? If so, is there anything we can do to avoid it?

from Clytie (vi-VN, Vietnamese free-software translation team / nhóm  
Việt hóa phần mềm tự do)
http://groups-beta.google.com/group/vi-VN