Home » Mailing list archives » git » 2008 » November » 7

Re: [PATCH (GITK) v3 4/6] gitk: Make cherry-pick call git-citool on conflicts.

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Paul Mackerras <paulus@...>
To: Alexander Gavrilov <angavrilov@...>
Cc: <git@...>
Subject: Re: [PATCH (GITK) v3 4/6] gitk: Make cherry-pick call git-citool on conflicts.
Date: Friday, November 7, 2008 - 7:51 am

Alexander Gavrilov writes:


The resolution capabilities of git citool seem to be that it detects
the conflict markers and lets you run meld on the 3 versions.  Have I
missed anything there?  Do people find that fixing things manually in
meld is sufficient, or do we really want something more powerful?

Paul.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH (GITK) v3 0/6] Enhance popup dialogs in gitk., Alexander Gavrilov, (Sun Nov 2, 2:59 pm)
[PATCH (GITK) v3 1/6] gitk: Add Return and Escape bindings t..., Alexander Gavrilov, (Sun Nov 2, 2:59 pm)
Re: [PATCH (GITK) v3 1/6] gitk: Add Return and Escape bindin..., Paul Mackerras, (Fri Nov 7, 7:41 am)
[PATCH (GITK) v3 2/6] gitk: Make gitk dialog windows transie..., Alexander Gavrilov, (Sun Nov 2, 2:59 pm)
Re: [PATCH (GITK) v3 2/6] gitk: Make gitk dialog windows tra..., Paul Mackerras, (Fri Nov 7, 7:41 am)
[PATCH (GITK) v3 3/6] gitk: Add accelerators to frequently u..., Alexander Gavrilov, (Sun Nov 2, 2:59 pm)
Re: [PATCH (GITK) v3 3/6] gitk: Add accelerators to frequent..., Paul Mackerras, (Fri Nov 7, 7:50 am)
Re: [PATCH (GITK) v3 3/6] gitk: Add accelerators to frequent..., Alexander Gavrilov, (Sun Nov 9, 7:21 am)
[PATCH (GITK) v3 4/6] gitk: Make cherry-pick call git-citool..., Alexander Gavrilov, (Sun Nov 2, 2:59 pm)
Re: [PATCH (GITK) v3 4/6] gitk: Make cherry-pick call git-ci..., Paul Mackerras, (Fri Nov 7, 7:51 am)
[PATCH (GITK) v3 5/6] gitk: Implement a user-friendly Edit V..., Alexander Gavrilov, (Sun Nov 2, 2:59 pm)