I am currently working on featurex branch. Our master branch is named our-team. Since I started working on featurex, more changes have been made to branch our-team.
I have done this locally to get all the latest changes from our-team:
git checkout our-team
git pull
Before I push featurex for merging, I would locally like to get all changes from our-team branch into featurex so that I can ensure everything works as expected.
How can I do that?