Re: [PATCH 1/7] merge-ort: mark a few more conflict messages as omittable
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 31, 2021, 21:06 UTC
- Message-ID
- <xmqqzgsxs4rk.fsf@gitster.g>
- In-Reply-To
- <df6e2774f1a5560a598dd8b46131bc6b0a261d4a.1630376800.git.gitgitgadget@gmail.com>
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 11 quoted lines
> From: Elijah Newren <newren@gmail.com> > > path_msg() has the ability to mark messages as omittable when recording > conflict messages in an in-tree file. This conflict message file will > then be shown by diffing the merge-created tree to the actual merge > commit that is created. While all the messages touched in this commit > are very useful when trying to create a merge initially, early use with > the --remerge-diff feature (the only user of this omittable conflict > message capability), suggests that the particular messages marked in > this commit are just noise when trying to see what changes users made to > create a merge commit. Mark them as omittable.
Sorry for asking something that may be obvious, but if you recreate an automated and potentially conflicting merge in-core, in order to then compare the recorded merge result, is there *any* message that is worth showing while doing the first step, and where in the output do users see them?