Re: VC mode and git

[Eli Zaretskii]

> Date: Sun, 05 Apr 2015 13:42:04 -0400
> From: Richard Stallman <address@hidden>
> CC: address@hidden, address@hidden, address@hidden
> 
> I typed 'git pull' in a terminal.  Since that tends to spew lots of
> output, I probably did not look at the output.  I did not realize
> there was any chance it might fail!  I expected the possibility of
> conflicts, but I expected to find out about them and fix them.

That "failure" is just a different expression of conflicts, that's
all.  the underlying issues are the same, it's just that CVS was less
verbose than Git in this case, and you are used to what CVS did, but
not yet used to how Git reacts to such conflicts.