Re: VC mode and git

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <address@hidden>
> Date: Wed, 01 Apr 2015 16:14:06 +0900
> Cc: Alan Mackenzie <address@hidden>, address@hidden
> 
> > but Eli says he *should* pull before committing, so that can't be
>  > the reason.
> 
> Eli says it's OK to do so; AFAIK Eli is basically neutral towards
> others' preferred workflows.  But I don't think Eli has a theory of
> git that says it's OK, just his own experience.

I explained in a previous message what I meant by "it's OK" in this
case.

> But I rather doubt Eli goes more than a couple days between pulls,
> so he would be unlikely to see startling numbers of files touched,
> whereas Richard is likely to run into that if he does have conflict.

I generally pull every day, sometimes several times.  I also have the
git-merge-changelog driver installed, so conflicts due to ChangeLog
files almost never happen to me.