How do I get feature branch B to include changes made in feature branch A?

I have a feature branch A making changes to program Alpha that is ready to merge to Master.

I have a second feature branch B making more changes to program Alpha.

How do I get the changes from branch A into branch B so I can continue making changes to program Alpha? 

1 answer

1 accepted

This widget could not be displayed.

The simplest thing to do would be to merge branch A to B. Any issues with that?

Depending on how you are using, you can also pull from master after branch A is merged to master. It all depends on your branching workflow.

yes thank you, that is what I did

  • git merged A into B
  • then I had to fix the merge conflicts in branch B,
  • then a git pull in branch B

When I created branch B, it should have been created off of branch A. That was the original mistake.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Aug 21, 2018 in Bitbucket

Branch Management with Bitbucket

As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...

1,335 views 8 11
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you