O'Reilly logo

Continuous Integration, Delivery, and Deployment by Sander Rossel

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

Merging

Merging a branch into another branch is easy enough. First of all, make sure you are in the branch where you want to merge to. So, if you want to merge jarvis into master, make sure everything you want to merge is committed and pushed and then switch to master using git checkout master. Now, simply use merge branch-name and resolve any conflicts that occur:

git branch my-branchgit checkout my-branch[Make some changes]git add .git commit -m "Some message"[optional] git push -u origin my-branchgit checkout mastergit merge my-branch

A nice option when merging is to merge but not commit automatically. This is the default behavior when you have merge conflicts. That way, you can inspect and edit your changes before committing. To do this, ...

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, interactive tutorials, and more.

Start Free Trial

No credit card required