[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Making git as easy as CVS, for handling merge conflicts
From: |
Eli Zaretskii |
Subject: |
Re: Making git as easy as CVS, for handling merge conflicts |
Date: |
Sat, 09 Nov 2019 20:37:37 +0200 |
> From: Richard Stallman <address@hidden>
> Cc: address@hidden, address@hidden
> Date: Sat, 09 Nov 2019 13:04:23 -0500
>
> How about adding a user option to enable or disable the creation of
> the multiple windows?
>
> (Is it Smerge mode which does that?)
Smerge mode doesn't, so we need first to figure out what feature did
that.
When you got the merge conflict, was that by invoking "git pull" from
the shell prompt, or did you do it in some other way?
And once you got the indication of the conflict, did you simply visit
the file with conflicts, or did you do something else? IOW, what can
you remember about the commands and actions you did before those
windows popped up?
- Re: Making git as easy as CVS, for handling merge conflicts, (continued)
- Re: Making git as easy as CVS, for handling merge conflicts, Eli Zaretskii, 2019/11/07
- Re: Making git as easy as CVS, for handling merge conflicts, Richard Stallman, 2019/11/07
- Re: Making git as easy as CVS, for handling merge conflicts, Eli Zaretskii, 2019/11/07
- Re: Making git as easy as CVS, for handling merge conflicts, Richard Stallman, 2019/11/08
- Re: Making git as easy as CVS, for handling merge conflicts, Eli Zaretskii, 2019/11/09
- Re: Making git as easy as CVS, for handling merge conflicts, Richard Stallman, 2019/11/09
- Re: Making git as easy as CVS, for handling merge conflicts, Eli Zaretskii, 2019/11/09
- Re: Making git as easy as CVS, for handling merge conflicts, Dmitry Alexandrov, 2019/11/09
- Re: Making git as easy as CVS, for handling merge conflicts, Richard Stallman, 2019/11/10
- Re: Making git as easy as CVS, for handling merge conflicts, Richard Stallman, 2019/11/09
- Re: Making git as easy as CVS, for handling merge conflicts,
Eli Zaretskii <=
- Re: Making git as easy as CVS, for handling merge conflicts, Richard Stallman, 2019/11/09
- Re: Making git as easy as CVS, for handling merge conflicts - pain felt with git, nipponmail, 2019/11/10
- Re: Making git as easy as CVS, for handling merge conflicts, Alexandre François Garreau, 2019/11/09
- Re: Making git as easy as CVS, for handling merge conflicts, Dmitry Alexandrov, 2019/11/05
- Re: Making git as easy as CVS, for handling merge conflicts, Richard Stallman, 2019/11/05
- Re: Making git as easy as CVS, for handling merge conflicts, Adam Spiers, 2019/11/06
- Re: Making git as easy as CVS, for handling merge conflicts, Richard Stallman, 2019/11/06
- Re: Making git as easy as CVS, for handling merge conflicts, Eli Zaretskii, 2019/11/07
- Re: Making git as easy as CVS, for handling merge conflicts, Eli Zaretskii, 2019/11/07
- Re: Making git as easy as CVS, for handling merge conflicts, Adam Spiers, 2019/11/07