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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mar 7, 2008, 13:53 UTC
Message-ID: <alpine.LSU.1.00.0803071453160.19395@racer.site>
In-Reply-To: <200803071446.39468.jnareb@gmail.com>

Hi,

On Fri, 7 Mar 2008, Jakub Narebski wrote:

Show 16 quoted lines

> 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?
> 
> To quote original email:
> 
> >> Inspired by one of complaints in http://openradix.org/archives/349
> >>
> >> (Merging tools and file servers on Windows are lacking. Windows
> >>  users expect the revision control to supply these tools.)

Indeed, I had forgotten that, and your mail did not quote it either.

Show 5 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.

Ciao, Dscho