Guten Tag Stefan Sperling,
am Montag, 24. Februar 2020 um 21:04 schrieben Sie:
> If several possible move targets exist, the 'svn' client will offer
> 'd' and 'w' conflict options which may help you to set the right
> destination paths.
It did, thanks. That's what I had expected from TSVN as well
On Mon, Feb 24, 2020 at 06:03:05PM +0100, Thorsten Schöning wrote:
> Hi all,
>
> I have a repo with 178'000 revisions, and need to sync-merge 2
> features branches: "feature1" and "feature2" created from "trunk" at
> different times and "feature1" merged into "feature2" successfully
> some days ag
Thorsten Schöning wrote on Mon, 24 Feb 2020 18:19 +0100:
> During merges this regularly leads to conflicts which TortoiseSVN
> tries to resolve by searching the repo for new merge targets and that
> search is incredibly slow if executed remotely.
>
> I tried to do the same merge using 2 URL-merges
Hi all,
I have a repo with 178'000 revisions and am accessing that using
OpenVPN and my home-DSL with 28/2 MBit/s. Most of the revisions
originate in branches I'm not interested of and are created
automatically by some software.
I have two unrelated feature branches based on trunk which I need to
Hi all,
I have a repo with 178'000 revisions, and need to sync-merge 2
features branches: "feature1" and "feature2" created from "trunk" at
different times and "feature1" merged into "feature2" successfully
some days ago already. That merge needs to be repeated now, but I'm
runnig into trouble.
T
