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
