From: Junio C Hamano <gitster@pobox.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH] sequencer: avoid garbled merge machinery messages due to commit labels
Date: Wed, 05 Aug 2020 15:26:47 -0700 [thread overview]
Message-ID: <xmqq8sesn2zc.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200805212032.GK9546@syl.lan> (Taylor Blau's message of "Wed, 5 Aug 2020 17:20:32 -0400")
Taylor Blau <me@ttaylorr.com> writes:
>> ...
>> <<<<<<<< HEAD:foo.c
>> int j;
>> ========
>> int counter;
>> >>>>>>>> b01dface (Removed unnecessary stuff):bar.c
>>
>> CONFLICT (rename/delete): foo.c deleted in b01dface (Removed
>> unnecessary stuff) and renamed in HEAD. Version HEAD of foo.c left
>> in tree.
>>
>> CONFLICT (file location): dir1/foo.c added in b01dface (Removed
>> unnecessary stuff) inside a directory that was renamed in HEAD,
>> suggesting it should perhaps be moved to dir2/foo.c.
>>
>> Signed-off-by: Elijah Newren <newren@gmail.com>
>
> This is much easier to read, and the change below is obviously correct.
> Thanks for working to improve the readability of these markers.
>
> Reviewed-by: Taylor Blau <me@ttaylorr.com>
Thanks. Looks good.
next prev parent reply other threads:[~2020-08-05 22:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-05 19:05 [PATCH] sequencer: avoid garbled merge machinery messages due to commit labels Elijah Newren via GitGitGadget
2020-08-05 21:20 ` Taylor Blau
2020-08-05 22:26 ` Junio C Hamano [this message]
2020-08-12 14:40 ` [PATCH v2] " Elijah Newren via GitGitGadget
2020-08-14 12:12 ` Johannes Schindelin
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=xmqq8sesn2zc.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=me@ttaylorr.com \
--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).