search

tdmalone / slackemon

Inspired by Pokémon Go, now you can catch and battle Pokémon with your teammates on Slack!
GNU General Public License v3.0
10 stars 3 forks source link

Decide on a git branch strategy #32

Closed tdmalone closed 7 years ago

tdmalone commented 7 years ago

Soon after I put this project on Github, and after @Naramsim's first pull requests, I slightly changed how I was branching. I noticed that @Naramsim then started setting his pull requests to go into my new tim branch - which is essentially my 'develop' branch.

To make things clearer, I'm thinking of adopting A successful Git branching model, minus the release branch flow for now (probably because we're in alpha, we generally just make releases when there's a feature or two that's ready, so that could happen straight from the develop branch). Version bumps would then happen directly after a merge from develop into master.

This would mean that each 'feature' I work on will have its own branch, which is not too different from how I have been developing tests and data-store. However, rather than merging into tim, I would instead merge into develop, which is also where @Naramsim and others could make their pull requests into.

Sound alright? @Naramsim?

Naramsim commented 7 years ago

Sounds good, thanks.

tdmalone commented 7 years ago

Ok this is now done! There is no more tim branch.

https://github.com/tdmalone/slackemon/branches