CODEWITHSUNDEEP
svnbranch
Erel Segal-Halevi
Erel Segal-Halevi

Reputation: 36745

How to merge a branch-of-a-branch directly to trunk

Our project has a "trunk".

I worked on Branch A, adding several features, and kept merging changes from "trunk".

Now, my work on Branch A is complete, and I would like to start working on new features.

However, the manager of the trunk does not want to reintegrate-merge Branch A back to trunk yet.

What should I do?

What is the best practice for this scenario?

Our server is SVN 1.6.

(NOTE: this is not identical to SVN branch of a branch )

Upvotes: 1

Views: 157

Answers (1)

Peter Parker
Peter Parker

Reputation: 29715

You should then wait for integration of branch A as long as you integrated branch B into A

In SVN there is a simple rule to keep yourself insane while merge:

Merge only from and into your branch Source(best is use integrate option)

All other methods(cross merging, cherry picking,..) create in the (near?) future some headache

Upvotes: 2

Related Questions