gh-pages vs master

[swcarpentry]

gh-pages vs master

[ChristinaLK]

My understanding from @gdevenyi was that if we remove the master branch, we remove old pull requests from before the split. Once we've closed those (hopefully soon!), I think we can delete master.

For now there's a note on the README for new pull requests to be against gh-pages.

[gvwilson]

Let's try to close them all by the end of next week - if that means discarding some, so be it.

[ChristinaLK]

Only one outstanding PR left! Almost there...

[gdevenyi]

Looks like we're all cleared up. There seems to be some stray branches that somehow were created by PRs? We can probably remove those too.

[wking]

On Wed, Mar 18, 2015 at 08:30:16AM -0700, Gabriel A. Devenyi wrote:

There seems to be some stray branches that somehow were created by
PRs? We can probably remove those too.

The -patch- stuff is probably from folks creating PRs using GitHub's
web UI. Here's where the existing branches were used:

• lexnederbragt-patch-2, #90, merged
• lexnederbragt-patch-1, #86, open
• stephenturner-patch-1, #67, merged

I'd leave lexnederbragt-patch-1 alone until #86 is resolved, but
you're free to remove the other two.

[ChristinaLK]

Done! Will delete the note in the README.