[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: |
Tue, 31 Mar 2015 17:07:36 +0300 |
> From: Sebastien Vauban <address@hidden>
> Date: Tue, 31 Mar 2015 15:34:10 +0200
>
> > With git pull, if there are changes in the working directory, the
> > merge (i.e. merge from remote/master into master) part of the
> > operation is aborted before it starts, giving a message describing its
> > refusal. It does this even when there are no conflicts to deal with.
>
> What are we supposed to do in that case, if we're not yet ready to
> commit our files?
Nothing, IME. Contrary to the cited text, "git pull" with uncommitted
changes doesn't fail. I do this every time before committing a
changeset I intend to push, and it always worked for me.
By contrast, if you do commit, and _then_ pull, your pull might fail
to merge the new stuff from upstream, and _then_ you'd need to do
something to fix that. (I usually just "git reset HEAD^" and pull
again, then commit my changes again, after fixing the ChangeLog
entries to be in the correct order.)
- Re: VC mode and git, (continued)
- Re: VC mode and git, Eli Zaretskii, 2015/03/31
- Re: VC mode and git, Andreas Schwab, 2015/03/31
- Re: VC mode and git, Steinar Bang, 2015/03/31
- Re: VC mode and git, Alan Mackenzie, 2015/03/31
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Alan Mackenzie, 2015/03/31
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Steinar Bang, 2015/03/31
- Re: VC mode and git, Steinar Bang, 2015/03/31
- Re: VC mode and git, Sebastien Vauban, 2015/03/31
- Re: VC mode and git,
Eli Zaretskii <=
- Re: VC mode and git, Dmitry Gutov, 2015/03/31
- Re: VC mode and git, Eli Zaretskii, 2015/03/31
- Re: VC mode and git, Andreas Schwab, 2015/03/31
- Re: VC mode and git, Eli Zaretskii, 2015/03/31
- Re: VC mode and git, Andreas Schwab, 2015/03/31
- Re: VC mode and git, Eli Zaretskii, 2015/03/31
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Steinar Bang, 2015/03/31
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Alan Mackenzie, 2015/03/31