From: Sven Strickroth <sven@cs-ware.de>
Date: Sat, 22 Oct 2016 22:58:12 GMT
Subject: Stash pop/apply conflict and --theirs and --ours
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