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
go to your branch
featurex
git checkout featurex
merge the changes of
our-team
branch intofeaturex
branchgit 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.
You can use rebase, for instance, git rebase our-team
when you are on your branch featurex
.
It will move the start point of the branch at the end of your our-team
branch, merging all changes in your featurex
branch.
git fetch origin our-team
or
git pull origin our-team
but first you should make sure that you already on the branch you want to update to (featurex).