git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] checkout: allow ignoring unmerged paths when checking out of the index

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 29, 2008, 21:53 UTC
Message-ID
<7vzlmv32uv.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<7v7i9z4hx2.fsf@gitster.siamese.dyndns.org>

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.
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 4 in “checkout: do not check out unmerged higher stages randomly”
  1. 1/2 checkout: do not check out unmerged higher stages randomlyJunio C Hamano, Aug 29, 2008
  2. 2/2 checkout: allow ignoring unmerged paths when checking out of the indexJunio C Hamano, Aug 29, 2008
  3. Junio C HamanoAug 29, 2008
  4. Junio C HamanoAug 30, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.