Reintegrate Workflow

Question

Hallo experts,

A simple question from me, an old newbie to Tortoise SVN.

I am working on a branch and now I want to merge the changes in my branch (after committing) in the trunk. However, I am not sure of the correctness of the workflow. Should I first combine the trunk with my working copy, resolving all possible conflicts, and then transfer my branch to the trunk? Since most of my colleague is still on vacation, I can’t get any advice on these basics on my team.

Thank you very much in advance,

John in Munich

Answer 1

Yes.

Not sure what else to add, given that you said all this :)

, , , , , , . , . , , ; , Subversion.

. , , .

: Version Control with Subversion :

Subversion 1.5, a -- , - . , . , , ,

http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate

Answer 2

, , svn.

( ) svn ( /). , ( ) " (main/trunk)", svn, .

Answer 3

Yes, that’s the way.

Since you probably have a function branch, what you need to do is described in the redbook .

To rephrase:

• Merge trunkinto your branch
• Merge your branch in trunkwith optionreintegrate