From: Johannes Sixt Date: Sat, 29 Jan 2022 08:23:06 GMT Subject: Re: [PATCH 08/12] merge-ort: provide a merge_get_conflicted_files() helper function Message-ID: <0d7ba76c-9824-9953-b8ce-6abe810e2778@kdbg.org> In-Reply-To: Just a heckling from the peanut gallery... Am 29.01.22 um 07:08 schrieb Elijah Newren: > On Fri, Jan 28, 2022 at 8:55 AM Johannes Schindelin > wrote: >> Meaning: Even if stage 3 is missing from the first conflict and stage 1 is >> missing from the second conflict, in the output we would see stages 1, 2, >> 2, 3, i.e. a duplicate stage 2, signifying that we're talking about two >> different conflicts. > > I don't understand why you're fixating on the stage here. Why would > you want to group all the stage 2s together, count them up, and then > determine there are N conflicting files because there are N stage 2's? Looks like you are misunderstanding Dscho's point: When you have two conflicts, the first with stages 1 and 2, the second with stages 2 and 3, then the 2s occur lumped together when the 4 lines are printed in a row, and that is the cue to the parser where the new conflict begins. Dscho did not mean that all N 2s of should be listed together. -- Hannes