- Git 10
761 ：デフォルトの名無しさん[sage]：2014/10/13(月) 10:39:05.48 ID:UiUWyauZ - masterブランチでgit merge fixを実行してgit pushしたらこういうメッセージができました！
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@省略.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
git statusを実行すると
On branch master
Your branch and 'origin/master' have diverged,
and have 153 and 1 different commit each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean
助けてくださいどうしたらpushできますか？
|