Re: False conflict with interleaved merge commits
From: Daniel Dickison <daniel_at_bandcamp.com>
Date: Fri, 7 Feb 2020 11:34:20 -0500
On Feb 7, 2020, at 02:44, Stefan Sperling <stsp_at_elego.de> wrote:
Thanks for the detailed info and quick response. This is good to know that it’s a fundamental design issue that’s unlikely to be fixed in SVN itself.
As far as I know, it has only happened for us with a single developer merging between trunk and a branch, and accidentally interleaving the commits. We’ve already put in tooling to block that particular scenario in our wrapper scripts, so hopefully that mostly prevents this from occurring in the wild.
> An easy way to work around it is the following, which essentially
I did not know about this method to force a sync merge. I have a feeling this will come in handy!
This is an archived mail posted to the Subversion Users mailing list.