heroku に push できない


To git@heroku.com:cryptic-eyrie-8923.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@heroku.com:cryptic-eyrie-8923.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

とりあえず git fetch heroku して heroku/master と master の diff を見てみたのですが、当然ながら盛り込みたい差分のみ。
なので heroku/master と master を merge して push しました。