How to get changes from another branch

Question

I am currently working on featurex branch. Our master branch is named branch our-team. Since I started working on featurex, more changes h

Answer 1

You are almost there :)

All that is left is to

git checkout featurex
git merge our-team

This will merge our-team into featurex.

The above assumes you have already committed/stashed your changes in featurex, if that is not the case you will need to do this first.