search

berkeley-stat222 / mousestyles

2016 final project
http://berkeley-stat222.github.io/mousestyles/
BSD 2-Clause "Simplified" License
2 stars 33 forks source link

MRG: Wyshi rebase subproject issue#166 #182

Closed jarrodmillman closed 8 years ago

jarrodmillman commented 8 years ago

Cherry-picking from #176.

Here is what I did.

Here are my remotes:

$ git remote -v
origin  git@github.com:jarrodmillman/mousestyles.git (fetch)
origin  git@github.com:jarrodmillman/mousestyles.git (push)
upstream        git@github.com:berkeley-stat222/mousestyles.git (fetch)
upstream        git@github.com:berkeley-stat222/mousestyles.git (push)

First, I made sure my local master branch was up to date.

git checkout master 
git pull upstream master

Then

git remote add wyshi git@github.com:wyshi/mousestyles.git
git fetch wyshi subproject-issue#166
git checkout -b wyshi-rebase-subproject-issue#166
git cherry-pick 8acc3bf 893c1cb
git push origin wyshi-rebase-subproject-issue#166

Then I made this pull request.

coveralls commented 8 years ago

Coverage Status

Coverage increased (+1.2%) to 64.258% when pulling 1faa273d8c7582aaa0e9b3761627e339fee09388 on jarrodmillman:wyshi-rebase-subproject-issue#166 into 02a3e4612d33c2c4214de274012ca88e25c97ec1 on berkeley-stat222:master.

coveralls commented 8 years ago

Coverage Status

Coverage increased (+1.2%) to 64.258% when pulling 7f25e91cf7a52b15f7a846d65a43de4d28a4bd78 on jarrodmillman:wyshi-rebase-subproject-issue#166 into 02a3e4612d33c2c4214de274012ca88e25c97ec1 on berkeley-stat222:master.

jarrodmillman commented 8 years ago

@lynnzhao92 Would you check that I got the correct files?

lynnzhao92 commented 8 years ago

This is the correct file. Thank you for the rebase! I think we are ready to merge!