nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

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

unknown

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?

Accepted answers

Jobin Kuruvilla [Adaptavist]

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.

All comments

Jobin Kuruvilla [Adaptavist]

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.

unknown

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

unknown

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