[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: some bzrmerge.el questions

From: Stefan Monnier
Subject: Re: some bzrmerge.el questions
Date: Mon, 17 Jan 2011 14:29:02 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

>> 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).


reply via email to

[Prev in Thread] Current Thread [Next in Thread]