From: Heiko Voigt <hvoigt@hvoigt.net>
Date: Mon, 01 Mar 2010 17:12:29 GMT
Subject: Re: Add new option in the right click menu in git gui
Message-ID: <20100301171222.GA35830@book.hvoigt.net>
In-Reply-To: <7fce93be1002181511v1c671f82u7f3d7cc6e3512bab@mail.gmail.com>

On Fri, Feb 19, 2010 at 12:11:57AM +0100, Sylvain Rabot wrote:
> Hi,
> 
> In case of conflicts it is possible in git gui, through the right
> click menu, to use local or remote versions, but, unless I missed
> something, it is not possible, after using the merge tool, to add
> merged files to the index.
> 
> It would be nice if we could add merged files in the index directly in git gui.

I do not see anything missing. After resolving a conflict you usually
just need to add the files (in git gui click on the icon of the file).
Am I missing something? This is the usual conflict resolution workflow
for git, I see no need for an extra menu option.

cheers Heiko