[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: VC mode and git
From: |
Eli Zaretskii |
Subject: |
Re: VC mode and git |
Date: |
Sun, 05 Apr 2015 22:05:06 +0300 |
> From: "Stephen J. Turnbull" <address@hidden>
> Cc: address@hidden,
> address@hidden,
> address@hidden,
> address@hidden
> Date: Mon, 06 Apr 2015 03:45:32 +0900
>
> Unfortunately, there's the case that hasn't been mentioned explicitly,
> which is where he has a code change that touches multiple files, some
> of which are conflicted and some of which are not. The conflicted
> files have to be committed to keep git happy unless you do some
> "advanced" stuff, such as stash. I don't think you really want
> Richard's changes mixed with merge changes.
Yes, in that case all the uncommitted changes belonging to the same
changeset as the conflicted changes will have to be committed as well.
- Re: VC mode and git, (continued)
- Re: VC mode and git, Eli Zaretskii, 2015/04/04
- Re: VC mode and git, martin rudalics, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/04
- Re: VC mode and git, martin rudalics, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/05
- Re: VC mode and git,
Eli Zaretskii <=
- Re: VC mode and git, martin rudalics, 2015/04/06
- Re: VC mode and git, Eli Zaretskii, 2015/04/07
- Re: VC mode and git, martin rudalics, 2015/04/08
- Re: VC mode and git, Eli Zaretskii, 2015/04/08
- Re: VC mode and git, Steinar Bang, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Steinar Bang, 2015/04/05
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/05