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

Re: StGIT and conflicts

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
May 25, 2007, 10:00 UTC
Message-ID
<b0943d9e0705250300o419d1d7ld175b273dbed2429@mail.gmail.com>
In-Reply-To
<20070524164038.GA27661@diana.vm.bytemark.co.uk>
On 24/05/07, Karl Hasselström <kha@treskal.com> wrote:
> 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?

I don't think there are any advantages in deviating from the git behaviour, only that when I first implementing it, git didn't have any smarter behaviour and I used diff3 (or other external merger, which can be used right now as well).

I'm not sure if git-diff still works when there are conflicts in the index. The current stg behaviour is to reset the index to the base of the patch and a stg diff would show the diff (including the config markers) to the base. I find this quite handy.

-- 
Catalin
Previous: Karl HasselströmNext: Karl Hasselström
Message 2 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.