How, do I update the master branch to point to the tip of another branch if the master has had no knew commits since the other branch diverged?

Question

I have a master branch and a feature branch. There have been no new commits in the master branch since the feature branch diverged. Now, I have finished the feature branch. How, do I update the master branch to point to the tip of the feature branch? Thanks.

score 2 · Accepted Answer · answered Jun 08 '18 at 05:08

2

Simply merge feature into master: the merge will be a fast-forward one, meaning master HEAD will be updated to feature's HEAD

git checkout master
git merge feature

See more at "What is the difference between git merge and git merge --no-ff?".

From this article:

answered Jun 08 '18 at 05:08

VonC

1,262,500
529
4,410
5,250

Thanks. I understand. – Mr. Hax Jun 08 '18 at 12:26

How, do I update the master branch to point to the tip of another branch if the master has had no knew commits since the other branch diverged?

1 Answers1