From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Fri, 25 May 2007 10:00:33 GMT
Subject: Re: StGIT and conflicts
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