//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
        git merge our-team
//      or git cherry-pick {commit-hash} if you want to merge specific commits

//  push your changes with the changes of our-team branch
        git push

//Note: probably you will have to fix conflicts after merging our-team branch into featurex branch before pushing