From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: <git@vger.kernel.org>
Subject: Re: [PATCH v2 2/2] merge-recursive: avoid showing conflicts with merge branch before HEAD
Date: Thu, 18 Oct 2018 15:09:49 +0900 [thread overview]
Message-ID: <xmqqva5zu6oi.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20181016201948.16025-3-newren@gmail.com> (Elijah Newren's message of "Tue, 16 Oct 2018 13:19:48 -0700")
Elijah Newren <newren@gmail.com> writes:
> @@ -1283,6 +1302,18 @@ static int merge_mode_and_contents(struct merge_options *o,
> const char *branch2,
> struct merge_file_info *result)
> {
> + if (o->branch1 != branch1) {
> + /*
> + * It's weird getting a reverse merge with HEAD on the bottom
> + * side of the conflict markers and the other branch on the
> + * top. Fix that.
> + */
> + return merge_mode_and_contents(o, one, b, a,
> + filename,
> + branch2, branch1,
> + extra_marker_size, result);
> + }
Will queue with the following squashed in.
Thanks.
merge-recursive.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 16980db7f9..73b5710386 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1310,8 +1310,7 @@ static int merge_mode_and_contents(struct merge_options *o,
*/
return merge_mode_and_contents(o, one, b, a,
filename,
- branch2, branch1,
- extra_marker_size, result);
+ branch2, branch1, result);
}
result->merge = 0;
prev parent reply other threads:[~2018-10-18 6:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-12 21:25 [PATCH 0/4] More merge cleanups Elijah Newren
2018-10-12 21:25 ` [PATCH 1/4] t6036: add testcase where virtual merge base contains nested conflicts Elijah Newren
2018-10-12 21:25 ` [PATCH 2/4] merge-recursive: increase marker length with depth of recursion Elijah Newren
2018-10-15 5:12 ` Junio C Hamano
2018-10-15 15:02 ` Elijah Newren
2018-10-16 2:16 ` Junio C Hamano
2018-10-16 18:00 ` Elijah Newren
2018-10-12 21:25 ` [PATCH 3/4] merge-recursive: improve auto-merging messages with path collisions Elijah Newren
2018-10-15 5:18 ` Junio C Hamano
2018-10-12 21:25 ` [PATCH 4/4] merge-recursive: Avoid showing conflicts with merge branch before HEAD Elijah Newren
2018-10-15 5:23 ` Junio C Hamano
2018-10-16 20:19 ` [PATCH v2 0/2] More merge cleanups Elijah Newren
2018-10-16 20:19 ` [PATCH v2 1/2] merge-recursive: improve auto-merging messages with path collisions Elijah Newren
2018-10-16 20:19 ` [PATCH v2 2/2] merge-recursive: avoid showing conflicts with merge branch before HEAD Elijah Newren
2018-10-18 6:09 ` Junio C Hamano [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
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=xmqqva5zu6oi.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/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).