Re: [RFH] What do you think about adding graphical merge to git-gui?

From: Jakub Narebski <jnareb@gmail.com>
Date: Mar 7, 2008, 15:21 UTC
Message-ID: <200803071621.37376.jnareb@gmail.com>
In-Reply-To: <alpine.LSU.1.00.0803071453160.19395@racer.site>

Johannes Schindelin wrote:

Show 10 quoted lines

> On Fri, 7 Mar 2008, Jakub Narebski wrote:
>> Dnia piątek 7. marca 2008 12:54, Johannes Schindelin napisał:
>>> On Fri, 7 Mar 2008, Jakub Narebski wrote:
>>> 
>>>> What do you think about adding "merge" subcommand to git-gui,
>>>> or to be more exact adding tree-level merge and/or file-level
>>>> merge tool to git-gui? I think we could "borrow" some code from
>>>> TkDiff: http://tkdiff.sourceforge.net/ (which is also GPL)
>>> 
>>> Is there any reason not to use mergetool?

[...]

Show 7 quoted lines

>> Besides "git gui merge" can be more Git-aware than for example TkDiff 
>> invoked from git-mergetool. It can offer also resolution also to tree 
>> level conflicts, such as rename/rename, rename/delete and rename/add, 
>> delete/modify or for example the case when one side has file in 
>> subdirectory, and other has file in submodule.
> 
> Sure, go ahead.

Could you recommend some good (best if also free) documentation of Tcl/Tk, so I won't be doing "cargo cult" (copy'n'paste) programming?

-- 
Jakub Narebski
Poland