Bananas!

[mariquail]

Please.

[mariquail]

Ah, so cool! It merged my requests.

[jeffweiss]

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 mari_branch
  • 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