GitHub, Pull Requests, and ReadTheDocs – NGS2015

“We’re good enough and deserve github.”

2015-08-28_10-57-41

Dr. C. Titus Brown shares methods for using readthedocs, which he uses for classes including NGS2015, as well as github and forking pull requests. Sphinx is Python based, readthedocs is web-based method for putting stuff in Sphinx. Learning goals at top of lesson pages. We’re going to go through steps on the web all together. Screenshots become out of data too quickly.

http://angus.readthedocs.org/en/2015/week3/CTB_github_editing.html

Readthedocs will take some version controlled project from somewhere (github or bitbucket) and format it for you. GitHub webhook activated. Readthedocs will sync and automatically rebuild.

readthedocs

This is  my version of the readthedocs:

http://angus-ljcohen.readthedocs.org/en/stable/

Edit in github, this will update:

http://angus.readthedocs.org/en/2015/week3/merge-demo.html

Forking one repository with groups of people.

2015-08-28_09-56-11

Titus makes changes in file. Pull in changes made in central repository. My repo is behind:

behind_repo

Pull requests: One of top useful things Titus has learned! Goal is to keep track of changes, see progression.

Merge pull request, now all chnages updated. Click on “compare”, if there are any changes they will be highlighted. Once they are merged, there will not be any more changes. Sometimes you need to switch head fork to base fork accounts. Branches are very useful for years of courses, versions of software, etc.

compare_across_forks

Leigh: What are best practices with group of pull requests? What is one or some people are making tons, tons of changes? Should we pull? Master branch. You can ignore until ready to be merged. They will tell you when they want pull request, but they will have to reconcile with the one true. Person who is making changes has to deal with everyone else’s changes so everyone else doesn’t get behind. Software lines of code so “bombs” do not mess up everyone else’s code.

The one true branch.

2015-08-28_10-22-23

Amanda: Where do people who have write access to the one true master branch? Does she work in own fork? Those people can make their own fork then merge and conflict reconcile with one true. There are 2 commits, one to merge pull (fetch) from original, second to put change in.

Now, we make changes to files. Add names to attendees list:

https://github.com/ljcohen/angus/blob/2015/week3.rst

Now compare.

compare_changes

commit_code

Can search for commits, issues, and pull requests associated with this code.

Merge conflicts  occur when computer can’t resolve.

Win!

git_commit

Advertisements

About Lisa Johnson

PhD candidate at UC Davis.
This entry was posted in Genomics Workshop. Bookmark the permalink.

One Response to GitHub, Pull Requests, and ReadTheDocs – NGS2015

  1. Pingback: Intro git – Lab meeting | Lisa Johnson Cohen

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s