From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Jonathan Nieder <jrnieder@gmail.com>,
Sergey Organov <sorganov@gmail.com>
Subject: Re: [PATCH 1/7] merge-ort: mark a few more conflict messages as omittable
Date: Wed, 01 Sep 2021 10:19:04 -0700 [thread overview]
Message-ID: <xmqqk0k0qkmv.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BEZjMLGFxSsTfRnAffom9CKRU4if4PsdTh+85L6D=FseA@mail.gmail.com> (Elijah Newren's message of "Tue, 31 Aug 2021 17:03:07 -0700")
Elijah Newren <newren@gmail.com> writes:
> Creating this file means you see something like this in the
> remerge-diff (note there are diffs for two files, with the synthetic
> file appearing just before the file it has messages about):
>
> diff --git a/dir/my.fil e.conflict_msg b/dir/my.fil e.conflict_msg
> deleted file mode 100644
> index 2bd215a32f06..000000000000
> --- a/dir/my.fil e.conflict_msg
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -== Conflict notices for my.file ==
> -CONFLICT (modify/delete): dir/my.file deleted in HASH1 (SHORT
> SUMMARY1) and modified in HASH2 (SHORT SUMMARY 2). Version HASH2
> (SHORT SUMMARY2) of dir/my.file left in tree.
I do not know if my reaction should be "Cute" or "Yuck" ;-)
Hopefully nobody uses .conflict_msg as a suffix for their files.
next prev parent reply other threads:[~2021-09-01 17:19 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 2:26 [PATCH 0/7] Add a new --remerge-diff capability to show & log Elijah Newren via GitGitGadget
2021-08-31 2:26 ` [PATCH 1/7] merge-ort: mark a few more conflict messages as omittable Elijah Newren via GitGitGadget
2021-08-31 21:06 ` Junio C Hamano
2021-09-01 0:03 ` Elijah Newren
2021-09-01 17:19 ` Junio C Hamano [this message]
2021-08-31 2:26 ` [PATCH 2/7] merge-ort: add ability to record conflict messages in a file Elijah Newren via GitGitGadget
2021-09-28 22:29 ` Jeff King
2021-09-29 6:25 ` Elijah Newren
2021-09-29 16:14 ` Junio C Hamano
2021-09-29 16:31 ` Elijah Newren
2021-09-30 7:58 ` Jeff King
2021-09-30 8:09 ` Ævar Arnfjörð Bjarmason
2021-10-01 2:07 ` Elijah Newren
2021-10-01 5:28 ` Jeff King
2021-08-31 2:26 ` [PATCH 3/7] ll-merge: add API for capturing warnings in a strbuf instead of stderr Elijah Newren via GitGitGadget
2021-09-28 22:37 ` Jeff King
2021-09-28 23:49 ` Junio C Hamano
2021-09-29 4:03 ` Elijah Newren
2021-08-31 2:26 ` [PATCH 4/7] merge-ort: capture and print ll-merge warnings in our preferred fashion Elijah Newren via GitGitGadget
2021-09-28 22:39 ` Jeff King
2021-09-30 16:53 ` Ævar Arnfjörð Bjarmason
2021-10-01 1:54 ` Elijah Newren
2021-10-01 7:23 ` Ævar Arnfjörð Bjarmason
2021-08-31 2:26 ` [PATCH 5/7] tmp-objdir: new API for creating and removing primary object dirs Elijah Newren via GitGitGadget
2021-09-28 7:55 ` Ævar Arnfjörð Bjarmason
2021-09-29 4:22 ` Elijah Newren
2021-09-30 7:41 ` Jeff King
2021-09-30 14:17 ` Ævar Arnfjörð Bjarmason
2021-10-01 3:55 ` Elijah Newren
2021-09-28 23:17 ` Jeff King
2021-09-29 4:08 ` Junio C Hamano
2021-09-30 7:33 ` Jeff King
2021-09-30 13:16 ` Ævar Arnfjörð Bjarmason
2021-09-30 21:00 ` Jeff King
2021-10-01 3:11 ` Elijah Newren
2021-10-01 7:30 ` Ævar Arnfjörð Bjarmason
2021-10-01 8:03 ` Elijah Newren
2021-10-01 4:26 ` Elijah Newren
2021-10-01 5:27 ` Jeff King
2021-10-01 7:43 ` Ævar Arnfjörð Bjarmason
2021-09-29 5:05 ` Elijah Newren
2021-09-30 7:26 ` Jeff King
2021-09-30 7:46 ` Jeff King
2021-09-30 20:06 ` Junio C Hamano
2021-10-01 3:59 ` Elijah Newren
2021-10-01 16:36 ` Junio C Hamano
2021-10-01 2:31 ` Elijah Newren
2021-10-01 5:21 ` Jeff King
2021-09-30 19:25 ` Neeraj Singh
2021-09-30 20:19 ` Junio C Hamano
2021-09-30 20:00 ` Junio C Hamano
2021-10-01 2:23 ` Elijah Newren
2021-08-31 2:26 ` [PATCH 6/7] show, log: provide a --remerge-diff capability Elijah Newren via GitGitGadget
2021-08-31 9:19 ` Sergey Organov
2021-09-28 8:01 ` Ævar Arnfjörð Bjarmason
2021-09-29 4:00 ` Elijah Newren
2021-08-31 2:26 ` [PATCH 7/7] doc/diff-options: explain the new --remerge-diff option Elijah Newren via GitGitGadget
2021-08-31 11:05 ` [PATCH 0/7] Add a new --remerge-diff capability to show & log Bagas Sanjaya
2021-08-31 16:16 ` Elijah Newren
2021-08-31 20:03 ` Junio C Hamano
2021-08-31 20:23 ` Elijah Newren
2021-09-01 21:07 ` Junio C Hamano
2021-09-01 21:42 ` Elijah Newren
2021-09-01 21:55 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk0k0qkmv.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jrnieder@gmail.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=sorganov@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.