git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "B. Stebler" <bono.stebler@gmail.com>
To: git@vger.kernel.org
Subject: Improving merge of tricky conflicts
Date: Wed, 22 Jul 2020 01:29:51 +0200	[thread overview]
Message-ID: <a0418859-c62e-c207-a1b0-1b1aaf178527@gmail.com> (raw)

Hi,

I have been looking for a tool to display merge conflicts, that instead 
of showing the two versions of the conflicting section, would show the 
diff for that section in both conflicting commits.

The situation that would benefit a lot from this is when one branch has 
modified a large section of code (e.g. change in indentation), while the 
other branch has only a small change. In that case git will display the 
entire modified section twice, making it very hard to spot the difference.

Being able to see both commits diff would immediately make it clear how 
to apply the small change into the branch with the large edit.

I've looked around but couldn't find anything, but I'm pretty sure 
solutions exists. Anyone knows of an existing tool / script that does this?

Thank you,
B. Stebler


             reply	other threads:[~2020-07-21 23:29 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-21 23:29 B. Stebler [this message]
2020-07-22  5:50 ` Improving merge of tricky conflicts Johannes Sixt
2020-07-22  7:45   ` Jeff King
2020-07-22 17:26     ` Junio C Hamano
2020-07-23 18:25       ` Jeff King
2020-07-24  1:19         ` Junio C Hamano
2020-07-24 19:48           ` Jeff King
2020-07-24 20:18             ` Junio C Hamano
2021-01-16  2:50         ` Martin von Zweigbergk
2021-01-21 14:28           ` Jeff King
2021-01-21 20:30             ` Martin von Zweigbergk
2021-01-21 21:08               ` Jeff King
2020-07-22 20:17   ` Sergey Organov
2020-07-22 21:14     ` Junio C Hamano
2020-07-22 21:20       ` Sergey Organov
2020-07-23 18:26         ` Jeff King
2020-07-23 19:11           ` Sergey Organov
2020-07-23 21:39             ` Junio C Hamano
2020-07-24  5:15               ` Jacob Keller
2020-07-24  6:01                 ` Junio C Hamano
2020-07-24  6:53               ` Sergey Organov
2020-07-24 20:30                 ` Junio C Hamano
2020-07-24 22:11                   ` Sergey Organov
2020-07-24 23:04                     ` Junio C Hamano
2020-07-22 22:48   ` Bono Stebler

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=a0418859-c62e-c207-a1b0-1b1aaf178527@gmail.com \
    --to=bono.stebler@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. 
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).