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

Re: [PATCH v3 0/2] git-gui: change to display the combined diff in the case of conflicts.

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Apr 2, 2010, 08:37 UTC
Message-ID
<4BB5ACD3.10307@viscovery.net>
In-Reply-To
<v2z2cfc40321003311252s86d44ad7l540559eafb0636d4@mail.gmail.com>
Am 31.03.2010 21:52, schrieb Jon Seymour:
> I agree that removing the options is better than preserving the
> current behaviour,

So, we are in agreement in this. Suppose we do remove them. What remains that is dangerous?

The user has no option to accidentally revert changes that are not displayed even if the current diff --cc remains. The user is forced to run mergetool or to go to the editor.

It is now an orthogonal matter whether diff --cc is helpful. Here I do agree somewhat that diff against HEAD is more helpful than the current diff --cc.

> I would imagine that a change that proposed to remove the actions,
> without an option to enable them, would encounter stiff resistance
> from the list. However, perhaps the list can respond?

Who knows? There was not a lot discussion when the feature was presented to the list, not even a word of excitement.

http://thread.gmane.org/gmane.comp.version-control.git/94425/focus=94426
-- Hannes
Previous: Jon SeymourNext: Jon Seymour
Message 9 of 10 in “git-gui: change to display the combined diff in the case of conflicts.”
  1. 0/2 git-gui: change to display the combined diff in the case of conflicts.Jon Seymour, Mar 30, 2010
  2. Johannes SixtMar 31, 2010
  3. Jon SeymourMar 31, 2010
  4. Johannes SixtMar 31, 2010
  5. Jon SeymourMar 31, 2010
  6. Jon SeymourMar 31, 2010
  7. Johannes SixtMar 31, 2010
  8. Jon SeymourMar 31, 2010
  9. Johannes SixtApr 2, 2010
  10. Jon SeymourApr 4, 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.