4 ms·
> I systematically disable merge commits on every repo I manage. Do you have buy in from other team members for this? Also what do you do if master needs to b
by gdfasfklshg4 8y ago
> I systematically disable merge commits on every repo I manage.
Do you have buy in from other team members for this?
Also what do you do if master needs to be merged back into develop? Do you really rebase develop and make everyone fiddle with all their feature branches?
- scrollaway 8y agoThere is no develop, master is continuously deployed. Users can create feature branches and PR them but there is just no merge commit, they are pulled in fast-forward. In projects where I need stable releases, I create stable/1.2.x type branches off of master at a point in time. I cherry-pick commits onto it after the first release if there are subsequent ones. You can see this in action here: https://github.com/dj-stripe/dj-stripe/commits/master https://github.com/dj-stripe/dj-stripe/commits/master https://github.com/dj-stripe/dj-stripe/commits/stable/1.2 https://github.com/dj-stripe/dj-stripe/commits/stable/1.2