Re: VC mode and git

[Steinar Bang <sb@dod.no>]

>>>>> Richard Stallman <rms@gnu.org>:

>> Dangerous in which way?

> I don't know.  The git documentation says it can cause some sort of
> lossage, but was not specific.

As Eli said in a different message: disregard this as hypothetical.

>> If you get a conflict in the merge, git will not complete the commit
>> until the conflict is handled (much as any version control system).

> 1. Is that what happened to me?  I've sent the output of several
> diagnostic commands; perhaps you can tell from them.

I haven't followed the diagnostics too closely, but I know that you had
several unpushed commits, and your ChangeLog changes in one of these
commits conflicted with savannah's version of the ChangeLog.

What I'm not sure of is whether or not you also had uncommitted changes?
Did you commit before you pulled? Or did you commit and then pull?

> 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)
 3. git commit

The commit will open an editor, asking you to complete/confirme the
commit message (there will be a default message there indicating that
this is a merge commit, and what files conflicted in the merge. I
usually add stuff like "Manually resolved conflicted files" when I have
fixed things, but you can just close the editor and let the default
message stand).

What editor git chooses, depends on your EDITOR environment variable (I
use emacsclient).