git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Michael J Gruber <git@drmicha.warpmail.net>,
	Thomas Rast <tr@thomasrast.ch>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
	Eric Raible <raible@nextest.com>,
	git@vger.kernel.org
Subject: Re: Visualizing merge conflicts after the fact (using kdiff3)
Date: Thu, 18 Jun 2015 08:57:57 -0700	[thread overview]
Message-ID: <xmqqsi9pf1q2.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <5582B8EC.1060205@drmicha.warpmail.net> (Michael J. Gruber's message of "Thu, 18 Jun 2015 14:26:20 +0200")

Michael J Gruber <git@drmicha.warpmail.net> writes:

> This type of request comes up often (for a reason). I'm wondering
> whether we could support it more systematically, either by exposing the
> steps above as a command, or by storing the unresolved merge somewhere
> (leveraging stash or rerere).

Perhaps 'tr/remerge-diff' (on 'pu') is of interest?

  parent reply	other threads:[~2015-06-18 15:58 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 [this message]
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=xmqqsi9pf1q2.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    --cc=raible@nextest.com \
    --cc=tr@thomasrast.ch \
    /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).