Re:The Problem with Git Flow
by gonational on Wednesday June 24, 2020 @11:16AM
(#23628820)
+100
This is what we do at work.
Unless there is some major database or library or language version change in a feature branch, once that branch is tested and QA’d, the M.O. becomes “merge any feature branches that we’re ready to put live into master and release”.
Long-lived branches are a mess, and rebase flow is crushed by them.
If you can fit this kind of simple Git workflow into your development workflow, I recommend it.
This is what we do at work.
Unless there is some major database or library or language version change in a feature branch, once that branch is tested and QA’d, the M.O. becomes “merge any feature branches that we’re ready to put live into master and release”.
Long-lived branches are a mess, and rebase flow is crushed by them.
If you can fit this kind of simple Git workflow into your development workflow, I recommend it.