Git - Merging Back to Master
GitLab - Merging Back to Master
- We’ve kept our greet branch up to date with master (via rebase), now let’s merge the greet changes back into the master branch.
- Merge greet into master
git checkout master git merge greet
Because the head of master is a direct ancestor of the head of the greet branch, git is able to do a fast-forward merge. When fast-forwarding, the branch pointer is simply moved forward to point to the same commit as the greeter branch.
There will never be conflicts in a fast-forward merge.
- Review the logs
The greet and master branches are now identical.