SVN merge between branches is actually overwrite?
From: James <oldyoungguy88_at_yahoo.com>
Date: Sat, 26 Nov 2016 13:49:00 +0000 (UTC)
I just found if I merge branch B to branch A, the two branches will become the same. changes in branch A will gone. Is this by design? or I did something wrong? I am using the latest Tortoise.
I did more than once with the instruction found online:
In the From URL option, you should mention the branch to which you have to merge. For example, assume that there are 2 branches branch A and branch B, and you want to merge branch B to branch A. In TortoiseSVN, click on Merge option and then select Merge two different trees option. In the From URL, please mention URL of branch A and in the To URL, mention URL of branch B. This should merge branch B to branch A without loosing any files.
Thanks,James
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.