On Sun, Jan 21, 2024 at 12:06 PM Daniel Sahlberg <daniel.l.sahlb...@gmail.com> wrote: > > Hi, > > I'm trying to do a catchup merge between two branches (incidentally within > the Subversion website tree) but I fail and I don't have enough understanding > to know what is wrong. > > I have a working copy from https://svn.apache.org/repos/asf/subversion/site
Merging distinct branches is... one of the things that Subversion is not best with. I'd suggest using "git-svn" locally to play with, to see if you can resolve the differences by first merging from the trunk, then pull in the branches, and *then* push to the upstream branch. > Daniel Sahlberg >
