The git
workflow I am proposing here is a mixture between both the Gitflow Workflow and the Feature Branch Workflow. The reason for not using either is because I like the simplicity of the feature branch workflow as well as the robustness of the Gitflow workflow, but they both do not seem to fit the needs of a fast moving agency completely. I have therefore tried to take the best out of those two and adapt it to my or rather our company's needs.
Sometimes it is hard to maintain a proper development, test and release cycle. This can be due to many facts, but in my opinion mostly because of the following reasons:
- Multiple features being worked on at the same time which all have to be deployed to a testing environment for QA
- Features are getting pulled back or put on hold (by the