[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: VC mode and git
From: |
Steinar Bang |
Subject: |
Re: VC mode and git |
Date: |
Sat, 04 Apr 2015 18:09:58 +0200 |
User-agent: |
Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) |
>>>>> Eli Zaretskii <address@hidden>:
> I think it will succeed in fetching, and then refuse to merge.
Correct.
> But the way to handle this is the same as if the conflicted changes
> are committed: fix the conflicts, and then "git pull" again. Right?
No, that won't work: since the merge hasn't happened, there will be no
conflicts, just the uncommitted changes.
The only way to make git do the merge is to move away the uncommitted
changes, either by committing them, or by stashing them.
So to get out of the unpullable situation one either have to keep
committing changesets (and try a pull), or do
git stash
git pull
git stash pop
(unfortunately the "git stash pop" may also have a conflict, and getting
out of fixing the conflict without committing, is sort-of-advanced git,
at least nothing to put in a simple workflow)
- Re: VC mode and git, (continued)
- Re: VC mode and git, Robert Pluim, 2015/04/02
- Re: VC mode and git, Richard Stallman, 2015/04/03
- Re: VC mode and git, Eli Zaretskii, 2015/04/03
- Re: VC mode and git, Richard Stallman, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/04
- Re: VC mode and git, Steinar Bang, 2015/04/03
- Re: VC mode and git, Richard Stallman, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/04
- Re: VC mode and git, Steinar Bang, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/04
- Re: VC mode and git,
Steinar Bang <=
- Re: VC mode and git, martin rudalics, 2015/04/04
- Re: VC mode and git, Steinar Bang, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/04
- Re: VC mode and git, Richard Stallman, 2015/04/05
- Re: VC mode and git, Richard Stallman, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
Re: VC mode and git, Steinar Bang, 2015/04/01
Re: VC mode and git, Richard Stallman, 2015/04/01