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

Stash pop/apply conflict and --theirs and --ours

From
SSSven Strickroth <sven@cs-ware.de>
Date
Oct 22, 2016, 22:58 UTC
Message-ID
<169639c9-054f-8f4c-26bd-3f130fa4c1ee@cs-ware.de>
Hi,

I regularly experience that beginners have problems unterstanding that --ours and --theirs are swapped when a conflict occurrs on git stash apply or stash pop.

From the HCI perspective this is really counter intuitive.

So, I'd like to propose that on git shash pop/apply theirs and ours should be swapped in git index, so that git checkout --theirs and --ours work as expected.

PS: I'm sorry if this was already discussed, I haven't found any discussion.
-- 
Best regards,
 Sven Strickroth
 PGP key id F5A9D4C4 @ any key-server
Next: Jeff King
Message 1 of 2 in “Stash pop/apply conflict and --theirs and --ours”
  1. Sven StrickrothOct 22, 2016
  2. Jeff KingOct 23, 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.