search

swcarpentry / DEPRECATED-bc

DEPRECATED: This repository is now frozen - please see individual lesson repositories.
Other
299 stars 383 forks source link

Merge master to fixing instructions for contributors during transition #847

Closed rgaiacs closed 9 years ago

rgaiacs commented 9 years ago

Based on @wking's comment.

Cover #845 and #843.

@jiffyclub, @wking and @gvwilson Could merge this?

wking commented 9 years ago

On Sat, Nov 08, 2014 at 03:24:06PM -0800, Raniere Silva wrote:

Based on @wking's comment 1

Greg's #845 contained additional text (e.g. “We are currently reorganizing…” that I think should also land (maybe in master, but definitely in gh-pages).

rgaiacs commented 9 years ago

@wking I had cherry-pick Greg's #845 (see 4f3b33e).

wking commented 9 years ago

On Sat, Nov 08, 2014 at 04:03:46PM -0800, Raniere Silva wrote:

@wking I had cherry-pick Greg's #845 (see 4f3b33e).

Ah, I see. It looks like there are some other commits from master as well. I'm fine if c4d80be gets pushed straight to gh-pages (which will automatically close this PR), or if we drop c4d80be here and have whoever merges this PR create their own “merge into gh-pages” commit (e.g. via the big green button ;).

gvwilson commented 9 years ago

What's quickest?

wking commented 9 years ago

On Sat, Nov 08, 2014 at 04:18:18PM -0800, Greg Wilson wrote:

What's quickest?

@r-gaia-cs would have to update his branch for the big-green-button approach. Anybody with push access to bc can fetch his c4d80be and push it to bc/gh-pages.