Re: VC mode and git

[Eli Zaretskii]

> Date: Sat, 04 Apr 2015 10:48:03 -0400
> From: Richard Stallman <address@hidden>
> CC: 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.
> 
>   > Do you also push each such commit immediately, or do you wait for all
>   > of the fixes to be ready and committed, and then push them all in one
>   > go?
> 
> I have only once tried to install changes with Git, so there is no
> "usual" answer.  This time, I committed two or three change sets,
> separately.  Then I think I did a pull again.

My recommendation is to try pushing any change you commit that you
feel is ready to be pushed, as soon as you can, preferably right after
you commit it locally.  That will drive the probability of merge
conflicts during a pull even lower.