![]() ![]() When I’m done, I click the Git Flow button again and click “Finish Current”, and my client takes care of merging. Using SourceTree (or Tower), the branching and merging happens automagically I click a Git Flow button and, in the window that pops up, tell it that I want to create a feature, hotfix or release branch, and my client will take care of creating the branch. Hotfix branches are branched off prod and when they are done and tested, hotfix branches get merged into both prod and master. If there’s a problem with a component I built, I can create a hotfix branch, hotfix/fix_my_cool_feature. When the project is in a production-ready state, master gets merged into prod and then the QA process starts. When I’m done, my feature branch gets merged into master, and I can start working on a new feature. I can push this feature branch to the repo so other people can work on it while it’s still in development. When I start working on a new component for a site, I create a new feature branch, feature/my_cool_feature. ![]() To make sure this is the case, Git Flow introduces branch trees for features, hotfixes, and releases (we don’t use the latter). Prod is what will ultimately get pushed to a client’s site and master gets deployed to our lab server and is where most of the development happens.īoth prod and master need to stay clean–no broken or in-progress code should be pushed to those branches. We start off with two branches–at WDS these are prod and master (these are most often the master and develop branches in typical Git Flow environments). Git Flow makes extensive use of branches to ensure that work that you are currently developing doesn’t break things that someone else is working on.Ī lot has been written about Git Flow–the first time I learned about it was on Jeff Kreeftmeijer’s blog a couple years ago, but it was originally devised in 2010 by Vincent Dreissen. Since then, Git Flow has been added to popular Git GUI clients like SourceTree and Tower.įor those of you not familiar with Git Flow, I’m not going to go in depth about how it works, but I’ll walk through a really simple workflow example and how we use it at WDS. ![]() One of the benefits of using Git is quick and easy branching and merging without conflicts. Here at WebDevStudios, we use a variation of the Git workflow known as Git Flow. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |