3 ms·
We ran into a couple issues (none of them significant) 1. When someone merges their branch into development for QA, it's going to be there (with or without iss
by Eclyps 12y ago
We ran into a couple issues (none of them significant)
1. When someone merges their branch into development for QA, it's going to be there (with or without issues) for anyone else who merges for QA after that. If the first merge has bigger issues than expected, it's a bit of a pain to roll it back and re-merge the later branch. Without the development branch as a base for our QA, we just QA things one feature/release branch at a time. This lets us easily send back branches that aren't ready for production and move on to a different branch that is before any merging takes place.
2. We weren't sure how to handle pull requests with the development branch always being there. We used to set development as our "default" branch in github, so any pull requests would be automatically merged into there. That got a bit confusing, though, as most of us were so used to merged pull requests representing a change that has already been reviewed and accepted as production-ready. And as for the merge to master, should we submit another pull request? It just seemed like an unnecessary extra step in a lot of situations.
But you are absolutely right. Different flows work for different teams and projects. I'm sure as our team evolves, so will our workflow.
- jipiboily 12y agoFor #1, we use Fourchette (https://github.com/jipiboily/fourchette https://github.com/jipiboily/fourchette), which means we have a Heroku fork of our QA env for each GitHub PR. For merges to master, we submit other pull requests that we call "Release: ...". We can then see if CI and Rainforest tests are passing, if all is green, then we merge! :)