[Python-Dev] Hg tips
Stefan Krah
stefan at bytereef.org
Thu Sep 29 12:58:10 CEST 2011
Victor Stinner <victor.stinner at haypocalc.com> wrote:
> Because a merge is a new commit, I suppose that I can do something to
> get my local changes back. But, well, I just prefer the "legacy" (?)
> merge flavor:
>
> <<<< local
> ...
> ===
> ...
> >>> other
>
> It's easier for my brain because I just have 2 versions of the same
> code, not 3!
I also prefer /usr/bin/merge and I've never quite figured out the GUI.
Not that I spent a lot of time on it, since the "legacy" merge works
well (and is self-explanatory).
Stefan Krah
More information about the Python-Dev
mailing list