From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] reset: --unmerge
Date: Tue, 25 Oct 2016 20:32:39 +0300 [thread overview]
Message-ID: <87bmy81gi0.fsf@javad.com> (raw)
In-Reply-To: <xmqqa8dttkbw.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Mon, 24 Oct 2016 16:10:11 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> The procedure to resolve a merge conflict typically goes like this:
>
> - first open the file in the editor, and with the help of conflict
> markers come up with a resolution.
>
> - save the file.
>
> - look at the output from "git diff" to see the combined diff to
> double check if the resolution makes sense.
>
> - perform other tests, like trying to build the result with "make".
>
> - finally "git add file" to mark that you are done.
>
> and repeating the above until you are done with all the conflicted
> paths. If you, for whatever reason, accidentally "git add file" by
> mistake until you are convinced that you resolved it correctly (e.g.
> doing "git add file" immediately after saving, without a chance to
> peruse the output from "git diff"), there is no good way to recover.
"git reset --unmerge file"
to undo accidental
"git add file"
during conflict resolution?
I'm afraid "unmerge" sounds like revert of "merge", rather than revert
of "resolve". I'd rather prefer to see something like:
git add --undo file
git merge --unresolve file
git reset --unresolve file
in that order, to deal with the issue.
-- Sergey
prev parent reply other threads:[~2016-10-25 17:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-24 23:10 [PATCH] reset: --unmerge Junio C Hamano
2016-10-25 11:06 ` Duy Nguyen
2016-10-25 11:11 ` Duy Nguyen
2016-10-25 23:28 ` Junio C Hamano
2016-10-26 9:32 ` Duy Nguyen
2016-10-26 17:06 ` Junio C Hamano
2016-10-27 16:05 ` Andreas Schwab
2016-10-27 16:23 ` Junio C Hamano
2016-10-25 17:32 ` Sergey Organov [this message]
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bmy81gi0.fsf@javad.com \
--to=sorganov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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://80x24.org/mirrors/git.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).