Re: VC mode and git

[Steinar Bang]

>>>>> 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.

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.