From: Shawn Pearce <spearce@spearce.org>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <junkio@cox.net>,
git@vger.kernel.org
Subject: Re: [PATCH] merge-recursive: add/add really is modify/modify with an empty base
Date: Thu, 14 Dec 2006 06:41:45 -0500 [thread overview]
Message-ID: <20061214114145.GH1747@spearce.org> (raw)
In-Reply-To: <b0943d9e0612140331q4c3a32e2l361fd04375f091d7@mail.gmail.com>
Catalin Marinas <catalin.marinas@gmail.com> wrote:
> One nice addition to git-merge-recursive (probably only useful to
> StGIT) would be more meaningful labeling of the conflict regions,
> passed via a command line similar to the "diff3 -L" option. StGIT
> generates "patched", "current" and "ancestor" labels with diff3.
Indeed. Getting a SHA1 hash of the branch that I merged in by
name with "git merge foof" is horrible UI. I want to see "foof"
in the conflict. Its in my list of things I'd really like to fix,
but is currently low priority compared to the issues I've run into
this past week with git-merge-recursive's basic functions.
On the other hand Git's open source strategy is really paying off on
resolving those problems, typically the issue is fixed and accepted
by Junio into 'next' in under a day of identification. :-)
--
next prev parent reply other threads:[~2006-12-14 11:41 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-07 10:17 [PATCH 1/1] Make sure the empty tree exists when needed in merge-recursive Shawn O. Pearce
2006-12-09 23:55 ` [PATCH 1/3] diff_tree_sha1(): avoid rereading trees if possible Johannes Schindelin
2006-12-10 1:47 ` Junio C Hamano
2006-12-10 22:49 ` Johannes Schindelin
2006-12-09 23:56 ` [PATCH 2/3] merge-recursive: make empty tree a known object Johannes Schindelin
2006-12-10 18:37 ` Linus Torvalds
2006-12-10 21:21 ` Junio C Hamano
2006-12-10 21:31 ` Linus Torvalds
2006-12-10 22:33 ` Junio C Hamano
2006-12-10 22:54 ` Linus Torvalds
2006-12-10 22:28 ` Junio C Hamano
2006-12-10 23:16 ` Johannes Schindelin
2006-12-09 23:56 ` [PATCH 3/3] add test case for recursive merge Johannes Schindelin
2006-12-10 0:18 ` Johannes Schindelin
2006-12-10 3:10 ` Junio C Hamano
2006-12-10 22:51 ` Johannes Schindelin
2006-12-12 22:49 ` [PATCH] t6024: fix timing problem Johannes Schindelin
2006-12-12 23:23 ` Junio C Hamano
2006-12-12 23:59 ` Johannes Schindelin
2006-12-13 3:05 ` [PATCH] merge-recursive: add/add really is modify/modify with an empty base Johannes Schindelin
2006-12-13 6:33 ` Junio C Hamano
2006-12-13 11:46 ` StGit repo & gitweb, was " Johannes Schindelin
2006-12-13 11:56 ` Jakub Narebski
2006-12-13 22:09 ` Catalin Marinas
2006-12-13 23:06 ` Robin Rosenberg
2006-12-13 23:50 ` Johannes Schindelin
2006-12-13 23:57 ` Jakub Narebski
2006-12-19 18:50 ` Petr Baudis
2006-12-19 19:39 ` Jakub Narebski
2006-12-13 22:01 ` Catalin Marinas
2006-12-13 22:26 ` Junio C Hamano
2006-12-13 23:48 ` Johannes Schindelin
2006-12-14 11:31 ` Catalin Marinas
2006-12-14 11:41 ` Shawn Pearce [this message]
2006-12-14 12:00 ` Shawn Pearce
2006-12-14 13:44 ` Johannes Schindelin
2006-12-14 14:15 ` Catalin Marinas
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061214114145.GH1747@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).