![]() ![]() ![]() It does require discipline to consistently do, but that is where tools like SourceTree make it easier. We do not find gitflow to be cumbersome or cause any drag in our system. Sometimes we do have multiple hotfixes and releases in queue, but typically we don’t. We do the hotfix, then Finish it by merging into master and develop along with tagging since the version needs to be incremented. Now on to hotfixes, we create a hotfix branch from master if we have what we deem to be a hotfix. That kicks off the CI/CD process that deploys it to production. Once a release has been tested and signed off, we will Finish the release by merging it into master and develop along with tagging it with it’s version number. Those new commits, get automatically deployed for an additional round of testing. If any bugs are found during testing, we typically fix those bugs on the release branch. From there testers, start doing their testing. In our CI/CD, release branches get automatically deployed to our test environment. Once we are ready to create a release, we create a release branch. We do not always use feature branches, especially when features are small and do not require many changes to other parts of the application. Once development is far enough along and we determine that a particular feature may create a large impact, we will start using a feature branch. We typically start development of a new project, purely working on the develop branch. With the basics out of the way, lets get down to what we do. It also makes it super easy to create feature branches, release branches, and hotfix branches along with the workflows for merging them back to the appropriate branches. That initialization just makes sure you have a master and develop branch. We typically initialize gitflow in the repository using SourceTree. We typically start all projects by creating the initial repository, then once the repository has been cloned, we create a develop branch and push that back up.Īs part of our process we typically use SourceTree as your GUI tool, SourceTree and GitKraken have built in support for gitflow. We also have tied our semantic versioning into how we use gitflow, all of this is part of our CI/CD approach. We have found it helps to keep a consistent workflow. What a great opportunity to write a blog post.Īt work, we use gitflow for every size project, small to large. This question came up in a Twitter discussion, it was about using gitflow. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |