Jim Meyering wrote: > I've learned not to modify ChangeLog on my private branches.
Certainly the ChangeLog will be the file that causes the most conflicts. But conflicts can occur any time, even for intended short-lived modifications, therefore I need to learn how to deal with conflicts even if they are not from ChangeLog. Bruno
