Home/ Questions/Q 809525
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-15T00:44:34+00:00

I need to merge changes from a branch back into trunk but want to

  • 0

I need to merge changes from a branch back into trunk but want to continue work on the existing branch.

I was going to use a re-integrate merge but realised this is not suitable as I will need to recreate my branch etc which for a variety of reasons is not desirable.

What I really want to do is merge the current revisions in the branch down to head and then keep people working on their current working copies.

So my question is , can tree merge be used to solve this or do I have to reintegrate and recreate.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    You can merge the branch to the trunk and keep on working in the branch, without recreating the branch – that’s not an issue.

    For your own convenience, you should include the revision range of the merge operation in the commit message (during commit to trunk). That way it will be easy to perform another merge operation in the future, starting from where you ended with this merge.

    • 0