Home/ Questions/Q 8167111
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-06T20:06:01+00:00

Our project has a trunk. I worked on Branch A, adding several features, and

  • 0

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?

  • I can start a new Branch B directly from trunk, but then I will not have my features from Branch A.
  • I can start a new Branch B from Branch A, but then I won’t be able to reintegrate-merge my new features from Branch B directly to the trunk (I tried this on a sample file and there were too many conflicts).

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 )

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    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

    • 0