From: Junio C Hamano <junkio@cox.net>
Date: Sat, 07 Jan 2006 08:41:34 GMT
Subject: Re: needs merge
Message-ID: <7v1wzko2f5.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <200601070332.36654.len.brown@intel.com>

Len Brown <len.brown@intel.com> writes:

> $ git commit
> my-file needs merge
>
> how do i tell git that there is no merge to do and the (unchanged) working file is what
> i want to keep as the result of the merge?

Do you mean running

    $ git update-index my-file

to mark the path resolved?