On 9/24/06, Petr Baudis <pasky@xxxxxxx> wrote:
In that case I think the most natural way for this tool to interface
would be in part of some kind of cg-resolve swiss-army knife for
resolving conflicts:
cg-resolve --mine for taking just the version from _my_
side of the merge
cg-resolve --other dtto for the other side of the merge
cg-resolve -g graphically resolve
(vimdiff/xxdiff/meld/...)
surely more would be invented over time
Sounds reasonable. But I think we have to keep in mind that you only
know if the conflict is nasty after you have a go at fixing it. And I
sometimes find that I try with cg-xxdiff... and I go back to the plain
old conflict. That is why it doesn't clobber the file -- to protect a
manual merge in process.
Well, all the Cogito scripts should have some consistent form. :-)
heh - consistency? overrated! ;-)
But I can adjust such details when applying your patch.
Great! -- I'm travelling and at an airport "free access" computer. It
should be illegal to run airports without free wifi in this day and
age.
cheers,
martin
-
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