[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Regarding smerge upper/lower; needs NEWS
From: |
Stefan Monnier |
Subject: |
Re: Regarding smerge upper/lower; needs NEWS |
Date: |
Thu, 15 Mar 2018 14:54:59 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
> Thanks. If we were using labels such as "Yours/Theirs" previously, I can see
> why "Upper/Lower" are better.
I plead guilty to the "mine/other" terminology used previously.
To my defense, this actually worked well in the context of CVS and at
that time CVS was pretty much the only real game in town.
While its flaws are visible in many other VCSes, in the context of
Git (where you often end up having to merge in the "other direction"
than the one you intended) "mine/other" *really* made no sense more
often than not.
Stefan
- Re: Regarding smerge upper/lower; needs NEWS, (continued)
- Re: Regarding smerge upper/lower; needs NEWS, Glenn Morris, 2018/03/15
- Re: Regarding smerge upper/lower; needs NEWS, Eli Zaretskii, 2018/03/15
- Re: Regarding smerge upper/lower; needs NEWS, Óscar Fuentes, 2018/03/15
- Re: Regarding smerge upper/lower; needs NEWS, Eli Zaretskii, 2018/03/15
- Re: Regarding smerge upper/lower; needs NEWS, Stefan Monnier, 2018/03/15
- RE: Regarding smerge upper/lower; needs NEWS, Drew Adams, 2018/03/15
- Re: Regarding smerge upper/lower; needs NEWS, Stefan Monnier, 2018/03/15
- RE: Regarding smerge upper/lower; needs NEWS, Drew Adams, 2018/03/15
Re: Regarding smerge upper/lower; needs NEWS, Richard Copley, 2018/03/15