Answer by paul_h for How to get rid of develop branch for simplified Git flow
Well @dan-cornilescu says it well for your particular problem, but the more general case for Trunk-Based Development (mentioned in the Continuous Delivery, Lean Enterprise, and The DevOps Handbook) is...
View ArticleAnswer by Dan Cornilescu for How to get rid of develop branch for simplified...
IMHO the problems you're facing are just a side effect of the poor branch strategy you started with: you're effectively plowing new development on develop (i.e. what converges towards the future...
View ArticleAnswer by Evgeny Zislis for How to get rid of develop branch for simplified...
You are already building and testing code on each of the pull-request and hot-fix branches. This means that in aggregate, the sum of all branches pending on pull-request are your virtual develop...
View ArticleAnswer by Jiri Klouda for How to get rid of develop branch for simplified Git...
Let's say you take out the master branch (you can rename develop to master to confuse your team if you like later) and simply use tags for releases either on develop or hotfix branches. You took out a...
View ArticleHow to get rid of develop branch for simplified Git flow
In a continuously developed web project (not a product) we currently have the following branching strategy, roughly based on git flow:develop branch: latest working versionmaster branch: version to be...
View Article