git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Add new option in the right click menu in git gui

From
Heiko Voigt <hvoigt@hvoigt.net>
Date
Mar 1, 2010, 17:12 UTC
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:
Show 8 quoted lines
> 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
Previous: Sylvain RabotNext: Sylvain Rabot
Message 2 of 5 in “Add new option in the right click menu in git gui”
  1. Sylvain RabotFeb 18, 2010
  2. Heiko VoigtMar 1, 2010
  3. Sylvain RabotMar 1, 2010
  4. Bert WesargMar 1, 2010
  5. Heiko VoigtMar 26, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.