Re: some bzrmerge.el questions

[Stefan Monnier]

>> Could you add a similar thing for changes in comments that only relate
>> to loaddef checksums? I think in such cases, it should not bother
>> merging the change.

> During recent bzr updates I got a number (~ 5) of conflicts wrt loaddef
> checksums.  I simply ignored them via bzr revert.  Was that the right
> way to deal with this problem?

AFAIK that's the right way: choose one of the 3 options (doesn't matter
which).  Then run "make" which should update the autoloads and in turn
update the md5 checksums to the value they need to take (which can be
a 4th value rather than one of the three from the conflict).


        Stefan