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

1 vote

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
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 12, 2018 in Bitbucket

Do you use any Atlassian products for your personal projects?

After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...

23,408 views 26 12
Join discussion

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