How to get changes from another branch

Before following these instructions keep in mind that featurex is the branch where changes are being merged and pushed

1. go to your branch featurex

   git checkout featurex
   

2. 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.

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