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
In $WC/staging/, I run:
[[[
$ svn merge
On Sun, Jan 21, 2024 at 12:06 PM Daniel Sahlberg
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.apach
On Sun, Jan 21, 2024 at 12:06 PM Daniel Sahlberg
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.apach
