Chocolate is great#66

Open

mirako wants to merge 1 commit intojeffweiss:masterfrom

mirako:class/master/abc_mira

mirako commented Jul 11, 2014

Especially dark


          Chocolate is great

15f3c42

Owner

jeffweiss commented Jul 11, 2014

This is a note for next time:
I can't automatically merge this, so we'll

rebase against master
- git checkout master
- git fetch upstream
- git merge --ff-only upstream/master
- git checkout class/master/abc_mira
- git rebase master
- fix merge conflicts
- git push -f origin HEAD
Squash these two commits into a single one
- git rebase -i HEAD~2
- git push -f origin HEAD

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet