[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: Sat, 15 Jan 2011 23:30:42 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

>> BTW, I also committed a change to smerge, which I used to automate
>> most of the conflict resolution (there was tons of spurious
>> conflicts with the copyright year update, as you must know, and most
>> of them could be resolved automatically).

> Well, that would certainly make anyone who resolved them all by hand
> look foolish...

Well, it's when I started to feel foolish that I dediced to bite the
bullet and write the code in the first place.

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

I might do just that next time I bump into such conflicts, but the
problem is that those are specific to Emacs code so I expect it'll take
more coding to figure out where to put that code.


reply via email to

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