Just curious :)
89 karma · joined March 22, 2011
Just curious :)
Also, once something is on develop/staging, it is about to be shipped. If there is any bug in there, they are they should be fixed ASAP.
As we grow, we might have to do things differently, we'll see, but this works really well for us right now. :)
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! :)
There might be a point where this won't work for us anymore, it's always time to change.
Also, this is not because a branching model works for a team that it will for all teams and projects.
Like any in-house, process the branching model will evolve with the team and it's requirements to be efficient.
Also, I prefer merge over rebase.
That's a problem with free services, and sometimes even with some paid services.