3 ms·
I find all of these posts on "the right way to use git" pretty tiresome. At the end of the day it's really not that complicated and you will probably have more
by jpgvm 11y ago
I find all of these posts on "the right way to use git" pretty tiresome.
At the end of the day it's really not that complicated and you will probably have more luck by keeping it that way. Bringing in a complex workflow that isn't rooted in the flow of work in your organisation makes no sense.
Stick to master being the newest code, fixes done in a branch, review and rebase ontop of master, features the same just hang around in a branch for longer - still rebase ontop of master. Maintain branches for releases and cherry-pick from master onto them.
If your workflow takes a blog post to describe it's just too damn complicated.
- radicalbyte 11y agoGitflow is exactly this, only they add an extra branch which tracks all of the releases. And, for some weird reason, call it 'master'.