just making sure people see this :) On 10 Nov 2016, at 19:36, Christopher Collins wrote:
> FYI - I will be merging the develop branch into master later today. If > you are using the master branch, and you are not prepared to switch over > to the latest, then be careful with git pulls and newt syncs! > > Thanks, > Chris > > On Thu, Nov 10, 2016 at 08:30:28AM -0800, Christopher Collins wrote: >> (changing subject to prevent mail from being categorized as a commit) >> >> On Thu, Nov 10, 2016 at 01:23:36PM +0100, 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.) >> >> Oops - I forgot about master when I created these branches. I don't >> think it makes much of a difference in practice which branch the dev >> branches come from, but I agree that using master feels more correct. >> It is probably best to delete these branches and recreate them after >> merging develop to master. If there are no objections, I will do this >> in the next few hours. >> >> Thanks, >> Chris
