合并另一个分支中的主节点

Question

Supposedly two people are working on a project and one of them, unknowingly from the other, creates a new branch in the project. Now, say the first person keeps on pushing changes to the master branch and the other branch gets outdated. How can I push the changes of master branch in to this outdated branch. For the sake of discussion, let's name that outdated branch as 'outdated-branch'. Appreciate your help.

Answer 1

Have yout tried to merge master into outdated-branch ?

git checkout outdated-branch
git merge master

Answer 2

Two possible ways: merge and rebase

First:

git checkout outdated-branch

Then merge:

git merge master

or rebase:

git rebase master

A discussion on advantages and disadvantages of either can be found here . The history of outdated-branch will look different other than that they produce the same result (including the same conflicts).