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

[Alan Mackenzie <acm@muc.de>]

Hello, Stefan.

On Mon, Feb 02, 2015 at 12:40:04PM -0500, Stefan Monnier wrote:
> >    $ 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.

> IIUC git did perform the merge, you simply have a file with a conflict
> as a result.  If you visit the file in Emacs, it should show you the
> conflicts and if once you've edited the file so as too remove the
> conflict markers, upon saving the result, Emacs should mark the file as
> "resolved" (which you can do manually with "git add lisp/ChangeLog").

OK.  I think what confused me was me thinking that there shouldn't be
"another" ChangeLog entry for the backported patch, given that there's
already one for the original patch.  But the ChangeLogs in Emacs 24 are
not the same files as those in Emacs 25.  Hence there needs to be an
entry in both of them.

>         Stefan

-- 
Alan Mackenzie (Nuremberg, Germany).