[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
In git, how does one revert a single file with merge conflicts in it?
|
From: |
Alan Mackenzie |
|
Subject: |
In git, how does one revert a single file with merge conflicts in it? |
|
Date: |
Mon, 2 Feb 2015 12:00:03 +0000 |
|
User-agent: |
Mutt/1.5.21 (2010-09-15) |
Hello, Emacs.
I'm attempting to backport a bug fix from master to emacs-24, following
the procedure in .../admin/notes/git-workflow.
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.
So, how do I revert ChangeLog to get rid of the conflicts? I've tried
$ git checkout lisp/ChangeLog
, but this just gives the puzzling error message "error: path
'lisp/ChangeLog' is unmerged". Isn't git great?
How do I revert a file in git?
TIA.
--
Alan Mackenzie (Nuremberg, Germany).