Re: In git, how does one revert a single file with merge conflicts in it?

[Alan Mackenzie]

Hi, Eli.

On Mon, Feb 02, 2015 at 06:05:26PM +0200, Eli Zaretskii wrote:
> > Date: Mon, 2 Feb 2015 12:00:03 +0000
> > From: Alan Mackenzie <address@hidden>

> > On doing
> >    $ git cherry-pick -xe <Commit Id>
> > , I get a half error message: "error: could not apply f3f7acc... ...".
> > Further investigation reveals that the cause is conflicts in a ChangeLog
> > file.  No surprises there.

> I suggest that you install the git-merge-changelog program and
> configure it as the merge driver for ChangeLog files.  Then the
> probability of such conflicts will be very close to zero.

Thanks, I didn't know about this program.  I'll see if I can get it
working in my git.

-- 
Alan Mackenzie (Nuremberg, Germany).