search

cognoma / cancer-data

TCGA data acquisition and processing for Project Cognoma
Other
20 stars 28 forks source link

Create sample-by-pathway dataset #25

Closed stephenshank closed 4 years ago

stephenshank commented 8 years ago

First attempt, would be very grateful for some code review!

stephenshank commented 8 years ago

I may have done something undesirable with git/github... for some reason, changes from my last pull request are showing up in this one. The file to look at is 5.hetnet-pathways.ipynb.

dhimmel commented 8 years ago

I may have done something undesirable with git/github...

You need to rebase your pull request on top of the latest upstream master. This will be a little more difficult because you based your pull request off of your master branch. Usually you make pull requests using a new branch, so your master branch can easily stay synced with upstream.

If you've configured cognoma/cancer-data to be upstream, then you should be able to do the following, while your master branch is checked out:

git fetch upstream
git rebase upstream/master
git push --force