[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#20878: smerge yours/other are backwards for git stash conflicts
|
From: |
Wolfgang Jenkner |
|
Subject: |
bug#20878: smerge yours/other are backwards for git stash conflicts |
|
Date: |
Tue, 23 Jun 2015 17:04:19 +0200 |
|
User-agent: |
Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.0.50 (berkeley-unix) |
On Tue, Jun 23 2015, Glenn Morris wrote:
> This seems backwards to me. The stash is my version, the upstream is the
> other version.
I think that's similar to what happens while rebasing; git-rebase(1)
explains this in the description of the -m switch.
So, swapping "mine" with "other" would be equally confusing for many
people.