Re: VC mode and git

[Steinar Bang]

>>>>> Richard Stallman <address@hidden>:

> I always commit an entire changeset -- that's why I use vc-dir -- but
> the changeset is often not all of the files I have edited.  Over a few
> weeks I may have fixed a few bugs in different files.  I commit the
> different fixes separately.

> vc-dir is good for that.

If this is your work pattern, you should commit all of your changesets
before attempting a push.

Ie.
 <commit changeset from vc-dir>
 <commit changeset from vc-dir>
 git push

Then if git fails because someone else have pushed since your last push, do
 git pull
 git push

If "git pull" gets conflicts, resolve the conflicts like with CVS, then
 git commit
 git push