From: Sebastian Schuberth <sschuberth@gmail.com>
To: git@vger.kernel.org
Subject: Re: Visualizing merge conflicts after the fact (using kdiff3)
Date: Mon, 6 Jul 2015 21:38:13 +0200 [thread overview]
Message-ID: <559AD925.9030408@gmail.com> (raw)
In-Reply-To: <557F791D.3080003@nextest.com>
On 16.06.2015 03:17, Eric Raible wrote:
> So naturally I want to check each of them for correctness.
Sorry for joining this thread so late, I only come to know about it from the draft of the upcoming Git Rev News 5 [1].
A while ago Robin Green was asking a very similar question on StackOverflow [2], and I came up with a script called "git-show-merge-resolution.sh" [3]. Maybe that's something you're interested in, too.
[1] https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-5.md#support
[2] stackoverflow.com/questions/24958182/kdiff3-to-code-review-merge-commit/24958228
[3] https://github.com/sschuberth/dev-scripts/blob/master/git/git-show-merge-resolution.sh
--
Sebastian Schuberth
prev parent reply other threads:[~2015-07-06 19:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-16 1:17 Visualizing merge conflicts after the fact (using kdiff3) Eric Raible
2015-06-16 9:43 ` Johannes Schindelin
2015-06-16 20:17 ` Eric Raible
2015-06-18 12:26 ` Michael J Gruber
2015-06-18 13:05 ` Johannes Schindelin
2015-06-18 15:57 ` Junio C Hamano
2015-06-19 8:34 ` Michael J Gruber
2015-06-19 16:19 ` Junio C Hamano
2015-07-06 19:38 ` Sebastian Schuberth [this message]
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=559AD925.9030408@gmail.com \
--to=sschuberth@gmail.com \
--cc=git@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.