From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Alan Mackenzie <acm@muc.de>
Cc: emacs-devel@gnu.org
Subject: Re: In git, how does one revert a single file with merge conflicts in it?
Date: Mon, 02 Feb 2015 12:40:04 -0500 [thread overview]
Message-ID: <jwvtwz4fc48.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <20150202120003.GA3673@acm.acm> (Alan Mackenzie's message of "Mon, 2 Feb 2015 12:00:03 +0000")
> $ 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").
Stefan
next prev parent reply other threads:[~2015-02-02 17:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-02 12:00 In git, how does one revert a single file with merge conflicts in it? Alan Mackenzie
2015-02-02 13:22 ` Andreas Schwab
2015-02-02 19:29 ` Alan Mackenzie
2015-02-03 9:04 ` Andreas Schwab
2015-02-03 9:26 ` David Kastrup
2015-02-03 22:36 ` Steinar Bang
2015-02-02 16:05 ` Eli Zaretskii
2015-02-02 19:32 ` Alan Mackenzie
2015-02-02 17:40 ` Stefan Monnier [this message]
2015-02-02 19:37 ` Alan Mackenzie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvtwz4fc48.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=acm@muc.de \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).