Missed Team ’24? Catch up on announcements here.

×
Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

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

Deleted user August 22, 2017

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? 

Answer
Watch
Like Be the first to like this
382 views

1 answer

1 accepted

1 vote
Answer accepted
Jobin Kuruvilla [Adaptavist]
Jobin Kuruvilla [Adaptavist]
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
Get recognized
August 22, 2017

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.

View More Comments
Deleted user August 22, 2017

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
Like
Deleted user August 22, 2017

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

Like
Reply

Suggest an answer

Log in or Sign up to answer
Bitbucket
Bitbucket
TAGS
AUG Leaders

Atlassian Community Events

    See all events