4 ms·
At my current job when I started people were doing git flow. It was horrendously complicated. I got rid of it and now everyone is happier. The idea is really s
by globular-toast 7y ago
At my current job when I started people were doing git flow. It was horrendously complicated. I got rid of it and now everyone is happier.
The idea is really simple. You have one eternal branch, "master", which is your integration branch. This is set to be the upstream of all other branches during development. That means it's really easy to keep rebasing on master every day. When your branch is ready it's merged into master (I do fast-forward only, but that doesn't matter). When you want to release, just tag a commit on master. If you want to maintain releases, make release branches for these and cherry pick fixes from master. Reset the maintenance branches to whatever release you are maintaining. It's easy.