From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: Re: [PATCH 2/2] checkout: allow ignoring unmerged paths when checking out of the index
Date: Fri, 29 Aug 2008 14:53:12 -0700 [thread overview]
Message-ID: <7vzlmv32uv.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7v7i9z4hx2.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Fri, 29 Aug 2008 14:42:33 -0700")
There is an obvious sequel to this story. We can enhance the behaviour of
checkout out of the index during a conflicted merge by doing the
following, which is the reason why I stumbled upon this bug that was fixed
by these two patches:
* Teach "git checkout --ours", "git checkout ---theirs" so that stages 2
and stages 3 for unmerged paths are checked out (and possibly resolve
the conflict).
* Teach "git checkout --merge" to redo the file level merge between
stages 1/2/3, and update the work tree with the result.
next prev parent reply other threads:[~2008-08-29 21:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-29 21:39 [PATCH 1/2] checkout: do not check out unmerged higher stages randomly Junio C Hamano
2008-08-29 21:42 ` [PATCH 2/2] checkout: allow ignoring unmerged paths when checking out of the index Junio C Hamano
2008-08-29 21:53 ` Junio C Hamano [this message]
2008-08-30 18:02 ` [PATCH 1/2] checkout: do not check out unmerged higher stages randomly Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vzlmv32uv.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.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.
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 NNTP newsgroup(s).