Adopting gitflow branch strategy

21 views
Skip to first unread message

mitch

unread,
Mar 20, 2012, 8:37:55 AM3/20/12
to boto...@googlegroups.com
Hi -

As you may have read in the posting to boto-users, I have decided to adopt the gitflow branch strategy described here:


The big change for boto developers is that we will now use the "develop" branch to merge release-ready features and bug fixes rather than master.  So, that means NO ONE PUSHES TO MASTER!

To make sure everyone understands this and acknowledges it, I have temporarily removed all commit access to the github repo.  If you still want commit access, please email me directly and acknowledge that you have read and understand the new branch strategy and that you understand you should commit to the "develop" branch, not the "master" branch.  Once I have received this acknowledgement, I will add you back to the list of committers.

Sorry if this seems a big extreme but once we start down this path, a commit to "master" really means "a new release" so, at least at this point, I should be the only person who every pushes to "master".  Any inadvertent commits to "master" will cause headaches especially as I start to move to an automated release process that is actually initiated by a commit to "master".

Let me know if you have questions or concerns.  Thanks,

Mitch

kfitz...@gmail.com

unread,
Mar 20, 2012, 9:13:09 AM3/20/12
to boto...@googlegroups.com
Thanks for putting this in place Mitch. I agree that no one should push to master. I wish github allowed permissions at the branch level :(. 

-kf

Mitchell Garnaat

unread,
Mar 20, 2012, 9:15:20 AM3/20/12
to boto...@googlegroups.com
Yeah, that would be nice.  I sent them a tweet, I'm sure they will just go and do that now 8^)

I just want to make it clear that my goal is not to get rid of committers, just to make sure everyone knows the rules.  And even then, someone will probably still screw up and, most likely, that someone will be me.

Mitch

Patrick Altman

unread,
Mar 20, 2012, 9:28:57 AM3/20/12
to boto...@googlegroups.com
now that the project is on github i dont think there really needs to be any comitters on the repo beyond those merging to develop and master.

instead people can fork, and send pull requests. github facilitates code review in pull requests quite nicely and adds another layer of good artifacts to the project.

just an idea that has worked well for my own projects.

---
Patrick Altman

Reply all
Reply to author
Forward
0 new messages