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

StGIT and conflicts

From
Karl Hasselström <kha@treskal.com>
Date
May 24, 2007, 16:40 UTC
Message-ID
<20070524164038.GA27661@diana.vm.bytemark.co.uk>

The current behavior of StGIT is to not use the index for conflicts like git does. What advantages does this have that are great enough to motivate a deviation from the git behavior?

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
Next: Catalin Marinas
Message 1 of 3 in “StGIT and conflicts”
  1. Karl HasselströmMay 24, 2007
  2. Catalin MarinasMay 25, 2007
  3. Karl HasselströmMay 25, 2007

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.