Re: VC mode and git

[Eli Zaretskii]

> From: Steinar Bang <address@hidden>
> Date: Sat, 04 Apr 2015 17:23:02 +0200
> 
> >>>>> Eli Zaretskii <address@hidden>:
> 
> > The same you did with CVS: just pull.  In most cases, this should
> > "just work".  It might fail if there are conflicts with stuff you pull
> > from upstream, in which case you should resolve the conflicts (like
> > you did with CVS).
> 
> Note that git will refuse to pull if there are uncommitted changes in
> any of the files touched by the pull.

I think it will succeed in fetching, and then refuse to merge.

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?

> So in the minimal CVS-like workflow either one need to extend that
> workflow to use stash in some cases, or one need to keep committing
> files/changesets until the pull is able to succeed.

I'd like to avoid stashing in the CVS-like workflow, if at all
possible.