How to get changes from another branch

Question

I am currently working on featurex branch. Our master branch is named branch our-team. Since I started working on featurex, more changes h

Answer 1

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.