On 24/05/07, Karl Hasselström <kha@xxxxxxxxxxx> 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
