[Top][All Lists]

[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 17:23:02 +0200
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt)

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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]