git error: failed to push some refs to 'git@github.com:foo/hoge.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'non-fast forward' section of 'git push --help' for details.

error: failed to push some refs to 'git@github.com:foo/hoge.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'non-fast forward'
section of 'git push --help' for details.

• git pushがrejectされたときの解決の手順 - 今日もスミマセン。

作業用ブランチ作る

git branch temp1
git checkout temp1

作業用ブランチにpullする

git pull origin +master:temp1

作業用ブランチとmasterブランチの差分を確認する

git diff temp1 master

masterブランチに作業用ブランチの内容をマージする

git checkout master
git merge temp1