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

Re: [PATCH (GIT-GUI FIX)] git-gui: Restore ability to Stage Working Copy for conflicts.

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Sep 9, 2008, 06:18 UTC
Message-ID
<48C61540.8070300@viscovery.net>
In-Reply-To
<200809082037.12173.angavrilov@gmail.com>
Alexander Gavrilov schrieb:
Show 8 quoted lines
> Tools like rerere leave files marked as conflicts in the index,
> while actually resolving them in the working copy. Also, some
> people like to use an external editor to resolve conflicts.
> 
> This patch restores functionality previously removed in
> commit 617ceee653 by adding a new context menu item.
> It still ensures that the user does not stage conflicting files
> accidentally by clicking on the icon instead of the name.
Thanks! Works well here.
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
-- Hannes
Previous: Alexander Gavrilov
Message 2 of 2 in “git-gui: Restore ability to Stage Working Copy for conflicts.”
  1. git-gui: Restore ability to Stage Working Copy for conflicts.Alexander Gavrilov, Sep 8, 2008
  2. Johannes SixtSep 9, 2008

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.