From: Jakub Narebski <jnareb@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
Paul Mackerras <paulus@samba.org>
Subject: Re: [RFH] What do you think about adding graphical merge to git-gui?
Date: Fri, 7 Mar 2008 14:46:37 +0100 [thread overview]
Message-ID: <200803071446.39468.jnareb@gmail.com> (raw)
In-Reply-To: <alpine.LSU.1.00.0803071254310.19395@racer.site>
Hello!
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.)
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.
--
Jakub Narebski
Poland
next prev parent reply other threads:[~2008-03-07 13:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200803071240.09999.jnareb@gmail.com>
2008-03-07 11:54 ` [RFH] What do you think about adding graphical merge to git-gui? Johannes Schindelin
2008-03-07 13:46 ` Jakub Narebski [this message]
2008-03-07 13:53 ` Johannes Schindelin
2008-03-07 15:21 ` Jakub Narebski
2008-03-07 15:27 ` Johannes Schindelin
2008-03-08 1:19 ` Paul Mackerras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200803071446.39468.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=paulus@samba.org \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox