bambooforest/phoible — pull request #1 by drammock (2014-09-10 22:41:24+00:00)
Title: Stevecantmerge

I think that if you merge this PR from `drammock/stevecantmerge` into your `bambooforest/master` branch, then it should fix the "unable to merge" issue and you should then be able to merge that branch into `phoible/master`. What I did was:

```
git remote add bambooforest git@github.com:bambooforest/phoible.git
git checkout -b stevecantmerge bambooforest/master
git rebase upstream/master
# the conflict was in the README... I just kept everything from the right side (your branch)
# and ignored everything from the left side (current phoible/master), and after saving the
# updated middle column in meld, then did this:
git rebase --continue
git push origin stevecantmerge
```

and then created this PR.