Home/ Questions/Q 3439990
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-18T08:22:42+00:00

We have multiple developers working on a project. We’re employing a feature-branch method of

  • 0

We have multiple developers working on a project. We’re employing a feature-branch method of branching in which we do the following:

  1. All maintenance work and bug fixes are done on the trunk
  2. All new functionality is done on a new branch
  3. Branch is updated regularly (via merging changes from trunk to branch)

However, we’ve run into a situation that 2 branches [we’ll call them feature-branch-1 and feature-branch-2] need to be merged together. What is the best way to accomplish this? Part of me thinks we should create a new branch. Then, merge that branch with the first feature branch [feature-branch-1]. And then merge with the second feature branch [feature-branch-2] and take care of the conflicts (which will most likely be the project files).

Is there a better way?

Thanks guys!

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    Oooh the merging. Love it.

    If you mean you want to combine feature-branch-1, feature-branch-2 and trunk into some new branch then yes – your way is good. Otherwise I wouldn’t waste precious time and just copy feature-branch-1 and merge feature-branch-2 into it. You’ve probably would’ve done it already instead of asking this question 😀

    • 0