OK, merging develop to master seems to have worked. Let's see how it all shows up on the GitHub mirror.
- Dennis -----Original Message----- From: Peter Kelly [mailto:[email protected]] Sent: Wednesday, December 17, 2014 16:06 To: [email protected] Subject: Re: Enabling Git Mirror (was RE: Subscribed) > On 18 Dec 2014, at 7:00 am, Dennis E. Hamilton <[email protected]> > wrote: > > Well ... > > We can easily revert the warning page I made on "master" and then merge > "developer" to master. > > That has them both in the same state and we can decide which way we want to > go from there, yes? > > Let's stand back until we hear from Peter. I’m ok with using master instead of develop for our main development branch. We just need to make note of this in our wiki to avoid confusion; the name “master” is ambiguous as some people (such as me) traditionally consider it to be the stable branch, while others think of it as a development branch. As long as we all understand its purpose it doesn’t matter what we call it, and probably “master” will cause less problems with (broken) tools that assume it always exists. — Dr Peter M. Kelly [email protected] PGP key: http://www.kellypmk.net/pgp-key <http://www.kellypmk.net/pgp-key> (fingerprint 5435 6718 59F0 DD1F BFA0 5E46 2523 BAA1 44AE 2966)
