![]() To be honest I squeezed a lot of use cases in one picture, but those situations might arise. ![]() If you just see the picture you might be overwhelmed. You can go back in time via the tags to see what was in production 5 weeks ago. So main/ master is always a mirror of your current production environment. This version then gets shipped to production. When that stage is complete you merge the release branch into main or master and tag the version. Here you can do further testing and only critical changes should be integrated for example via a hotfix branch. Then you branch off from your current develop and create a new release branch. After a while you decide we want to go to production. Once this is done you integrate that feature back to the develop branch. If you want to implement a feature you branch off from develop and create your own feature branch. You have an active development branch develop. There is a well defined life-cycle in Git-Flow. hotfix - Hotfix branches are cut from main/ master or release depending if you want to make a normal fix or a hotfix in production.No new features should be introduced here. Once you decide we're ready to release, you cut off from develop and can do some last bugfixes on that branch. release - The release branch is a gate keeper to production.feature - A feature branch is cut of from develop and once you are done it will go back to develop.develop - The active development branch.If you need the current production version you just check out this branch main/ master - The current version in production.The main idea is you have a set of branches which have a specific responsibility: Git-Flow tries to be an universal branching strategy which covers a lot of scenarios. In theory so nice and then the hard realitiy hits. We will see what are the pros and cons and when they are most applicable. In this article I want to show you 4 ways of doing so. There are many ways to organize your branches with git.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |