hashg

• go to the master branch our-team

git checkout our-team

• pull all the new changes from our-team branch

git pull

• go to your branch featurex

git checkout featurex

• merge the changes of our-team branch into featurex branch