From: Pierre Habouzit <madcoder@debian.org>
To: Kelvie Wong <kelvie@ieee.org>
Cc: git@vger.kernel.org
Subject: Re: Mergetool generating blank files (1.5.3)
Date: Thu, 27 Sep 2007 20:57:07 +0200 [thread overview]
Message-ID: <20070927185707.GC12427@artemis.corp> (raw)
In-Reply-To: <94ccbe710709271131o620bf1far8893328ce98f0ba4@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 944 bytes --]
On Thu, Sep 27, 2007 at 06:31:19PM +0000, Kelvie Wong wrote:
> At work, I've been using a git-svn import for my daily workflow (still
> somewhat of a git newbie, but now has come to the point where it's
> tough to work without it), and while rebasing from svn (on a rather
> old branch), I found that the mergetool option does not work too well
> for me.
Which tool are you using ? kdiff3 ? I've noticed that it often fails
miserably, or worse, create bad merges silentely with it.
And as none of the other merge tool that are supported are able to
either do 3way merges, or have a decent UI (that definitely seems to be
exclusive features) I've given up on git-mergetool (and to be fair, it
sucks, because it could be _sooo_ useful sometimes).
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-09-27 18:57 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-27 18:31 Mergetool generating blank files (1.5.3) Kelvie Wong
2007-09-27 18:57 ` Pierre Habouzit [this message]
2007-09-27 19:00 ` Russ Brown
2007-09-27 19:11 ` Pierre Habouzit
2007-09-27 22:23 ` Theodore Tso
2007-09-27 22:28 ` Pierre Habouzit
2007-09-28 5:15 ` Peter Baumann
2007-09-28 6:35 ` Pierre Habouzit
2007-09-27 19:12 ` Jeff King
2007-09-27 19:16 ` Pierre Habouzit
2007-09-27 19:41 ` Jeff King
2007-09-27 19:24 ` Kelvie Wong
2007-09-27 19:58 ` Junio C Hamano
2007-09-27 20:12 ` Kelvie Wong
2007-09-27 20:28 ` Junio C Hamano
2007-09-27 20:38 ` Kelvie Wong
2007-09-27 20:47 ` Junio C Hamano
2007-09-27 20:51 ` Junio C Hamano
2007-09-27 21:17 ` Kelvie Wong
2007-09-27 21:22 ` Kelvie Wong
2007-09-27 21:33 ` Junio C Hamano
2007-09-27 21:41 ` Junio C Hamano
2007-09-27 22:23 ` Kelvie Wong
2007-09-27 22:52 ` Theodore Tso
2007-09-28 4:17 ` Kelvie Wong
2007-09-28 6:19 ` David Kastrup
2007-09-27 22:35 ` Theodore Tso
2007-09-28 8:43 ` David Kågedal
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=20070927185707.GC12427@artemis.corp \
--to=madcoder@debian.org \
--cc=git@vger.kernel.org \
--cc=kelvie@ieee.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;
as well as URLs for NNTP newsgroup(s).