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

Re: git checkout --theirs fails

From
PSPhil Susi <phillsusi@gmail.com>
Date
Mar 16, 2016, 12:45 UTC
Message-ID
<56E95585.30409@gmail.com>
In-Reply-To
<xmqqd1qv76rn.fsf@gitster.mtv.corp.google.com>
On 3/15/2016 5:47 PM, Junio C Hamano wrote:
Show 7 quoted lines
> would fail when the path file/name is unmerged and does not have
> stage #3 entry, wouldn't it?  So with ".", unless all paths that
> match that pathspec (i.e. all available files) are either merged
> (i.e. without conflict) or have stage #3 entry, it is expected that
> the command would fail consistently to the case where a pathspec
> "file/name" that happens to match only one path is given, and that
> is the behaviour Phil saw, I would think.

Right... why is this though? Why doesn't it just check out those files that *do* have a #3 entry? And also why the nonsense about switching branches when you don't specify any path or branch?

Previous: Junio C HamanoNext: Jeff King
Message 4 of 5 in “git checkout --theirs fails”
  1. Phil SusiMar 15, 2016
  2. Stefan BellerMar 15, 2016
  3. Junio C HamanoMar 15, 2016
  4. Phil SusiMar 16, 2016
  5. Jeff KingMar 16, 2016

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.