Re: VC mode and git

[Eli Zaretskii]

> From: Steinar Bang <address@hidden>
> Date: Wed, 01 Apr 2015 17:43:46 +0200
> 
> > 2. With CVS, merge conflicts are easy to handle -- just edit the file,
> > look for the <<< and >>> that indicate conflicts, and fix up each one.
> > Can I do it that way in Git?
> 
> As Eli says: yes
> 
>  1. Edit the file, search for the conflict markers and fix them
>  2. git add name-of-conflicted-file ("git add ChangeLog" in your case)

This 2nd item should be done automatically by VC when you save a file
whose conflicts were resolved.

>  3. git commit