[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#20878: smerge yours/other are backwards for git stash conflicts
|
From: |
Stefan Monnier |
|
Subject: |
bug#20878: smerge yours/other are backwards for git stash conflicts |
|
Date: |
Tue, 23 Jun 2015 09:37:43 -0400 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> If you then do 'smerge-keep-yours' it takes the "upstream" version.
> If you do 'smerge-keep-other', it takes the "stash" version.
Yup, those names seemed like a good idea at the time, but they don't
work well now. We should change the names from "yours/theirs" to
something like "upper/lower".
Stefan