All geek questions in one place

Merge with Subversion, Merge Tree

I need to merge the changes from the branch back to the trunk, but you want to continue working on the existing branch.

I was going to use re-integration of the merge, but I realized that this is not suitable, since I will need to recreate my branch, etc., which for a number of reasons is undesirable.

What I really want to do is merge the current changes in the branch down, and then get people to work with their current working copies.

So my question is whether tree merging can be used to solve it, or do I need to reintegrate and recreate.

+3
source share
3 answers

, - .

( ). , , , .

+3

, , . : Subversion 1.5 - .

1.5 Subversion . . SVN: .

+2

Merging changes with a branch on the trunk does not affect the branch at all. Thus, you can continue to work in it without problems.

You will need a working copy of the trunk to complete the merge.

+1
source

Source: https://habr.com/ru/post/1746998/

More articles:


All Articles