Skip to content
This repository has been archived by the owner on Jan 3, 2018. It is now read-only.

Merging latest changes on master into gh-pages #776

Merged
merged 19 commits into from
Oct 1, 2014
Merged

Merging latest changes on master into gh-pages #776

merged 19 commits into from
Oct 1, 2014

Conversation

gvwilson
Copy link
Contributor

@gvwilson gvwilson commented Oct 1, 2014

Trying to keep gh-pages up to date in the run-up to #759.

gvwilson and others added 16 commits May 26, 2014 13:34
Create an empty lesson on forking and bump the other lesson numbers up accordingly.
Add the first draft of a new lesson about forking. The lesson covers creating a fork, creating pull requests, and reasons for using a fork instead of working off of one repo. Leaves out the details of code review.

This encompasses most of the material that is in lesson 03. The plan is to rewrite 03 to focus on pull requests and code review. It should cover using pull requests from different branches in the same repo as well as between forks.
to address comment #1 on pull request #517, this makes explicit that you won't
always be able to push directly to repositories other people have made.
remove redundant curriculum with 02-forking, add some additional images to help guide creating a pull request, and add an abstract guide to performing code review
…n-improve-code-review

Conflicts:
	novice/extras/02-review.md
Adds a new lesson about forking on GitHub
and revises the code review lesson.

Closes #517.
Add index for novice R lessons.
rgaiacs pushed a commit that referenced this pull request Oct 1, 2014
Merging latest changes on master into gh-pages
@rgaiacs rgaiacs merged commit 719e799 into swcarpentry:gh-pages Oct 1, 2014
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants