Ever had a team project with where merge conflicts seemed infinite? Code vanished constantly and nobody knew how? Or perhaps nobody could decide on how to create and merge new branches? Well you might want to consider GitFlow which solves all of these problems. It focuses on a master and develop branch, but allows you to create new features and releases for both of them with minimal risk of merge conflicts. What’s even better is popular Git GUI’s like SourceTree and Git Tower support it out of the box. For more info on GitFlow and getting started, check out the link below.