From: Junio C Hamano <junkio@cox.net>
Date: Fri, 27 May 2005 03:55:17 GMT
Subject: Re: resolving merge conflicts?
Message-ID: <7vekbt2uhm.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <429698A0.1020008@pobox.com>

>>>>> "JG" == Jeff Garzik <jgarzik@pobox.com> writes:

JG> So is there a doc or something that describes how to resolve merge
JG> conflicts?

JG> Presumably I look at .merge_file_*, and make sure that all necessary
JG> changes make it into the copy of the file in the working
JG> directory... then what?  How to continue the merge?

Then you would copy that .merge_* into the target file, and say

    git-update-cache $that_path

If your merge decision says to remove that file, then making
sure you do not have that file, you say

    git-update-cache --remove $that_path