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

Add new option in the right click menu in git gui

From
Sylvain Rabot <sylvain@abstraction.fr>
Date
Feb 18, 2010, 23:11 UTC
Message-ID
<7fce93be1002181511v1c671f82u7f3d7cc6e3512bab@mail.gmail.com>
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.

Besides, having this third option will avoid the mistake I used to make when I was a git beginner, knowing, after using the merge tools I was using the "use local version" options thinking it will add to the index the local changes I just made to the conflicted file.

Regards.
-- 
Sylvain
Next: Heiko Voigt
Message 1 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.