On 10/11/16 13:23, Sterling Hughes wrote:
Is the idea to merge these from develop or master?
I think we should probably merge develop->master now, prior to
branching anything. We should only be branching releases off of
master (which I’m assuming is the intention.)
+1 for this. :) It's difficult to do multi person development today
against develop since everyone needs to ensure they are on the same
commit, but there are so many important changes in develop that working
against master isn't viable today. That said, all the changes so far
have been worth the trouble and it will never be easier to break things
so if it takes more time it's better to drag it out a bit longer.