On Feb 7, 2020, at 02:44, Stefan Sperling wrote:
>
> On Thu, Feb 06, 2020 at 03:37:10PM -0500, Daniel Dickison wrote:
>> Strangely, the conflict goes away if you flip the order of steps 2 and 3,
>> or commit the merge from step 4 first.
>
> I would say it is working as
We think we’ve found a bug in Subversion’s conflict detection during merge
operations that results in a false conflict. It occurs after two ‘merge’
commands are committed in reverse order between two branches, and then a
subsequent merge is attempted. I’ve attached a repro script that illustrate
