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. ...
Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Read now
Unlock full access