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

The branching model

Now that you know how to use Git, create branches, merge them, move commits, push, pull, reset, clean, stash, and more, it is time you put this into practice. Any project should have at least two permanent branches, master and development. The development branch is where programmers put their work. When something is ready for release, it goes onto master, which should then be released.

If you do at least that, you are on your way. When a bug arises in production, you can branch from master; fix the bug on that branch, a hotfix branch if you like; and then merge that branch back into master (and release it) and development, fixing the bug for future releases.

Developers should always branch from the development branch. ...

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