git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed

From: Eric Raible <raible@nextest.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Visualizing merge conflicts after the fact (using kdiff3)
Date: Mon, 15 Jun 2015 18:17:17 -0700	[thread overview]
Message-ID: <557F791D.3080003@nextest.com> (raw)

I'm running 1.9.5.msysgit.1, but this is a general git question...

Upon returning from a vacation, I was looking at what people had been
up to, and discovered on merge in which a colleague had resolved a merge
incorrectly.  It turns out that he has pushed *many* merges over the past
year which had conflicts in my code, and now I don't trust any of them.

So naturally I want to check each of them for correctness.

I know about "git log -p -cc SHA -- path", but it really doesn't
show just the conflicts so there's just too much noise in that output.

I use kdiff3 to resolve conflicts, so I'm looking for a way to
visualize these already-resolved conflicts with that tool.
As I said, there are many merges, so the prospect of checking
out each sha, doing the merge, and then comparing the results
is completely untenable.

Can anyone help?  Surely other people have wanted to review how
conflicts were resolved w/out looking at the noise of unconflicted
changes, right?

Thanks - Eric (raible at gmail )

next             reply	other threads:[~2015-06-16  1:22 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-16  1:17 Eric Raible [this message]
2015-06-16  9:43 ` Visualizing merge conflicts after the fact (using kdiff3) 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

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=557F791D.3080003@nextest.com \
    --to=raible@nextest.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

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).