{"id":2587,"date":"2019-07-26T18:41:25","date_gmt":"2019-07-26T10:41:25","guid":{"rendered":"http:\/\/www.51cos.com\/?p=2587"},"modified":"2019-07-26T18:41:25","modified_gmt":"2019-07-26T10:41:25","slug":"non-fast-forward-updates-were-rejected%ef%bc%8cgit%e9%81%87%e5%88%b0%e8%bf%99%e4%b8%aa%e9%97%ae%e9%a2%98%e5%a6%82%e4%bd%95%e8%a7%a3%e5%86%b3","status":"publish","type":"post","link":"http:\/\/www.51cos.com\/?p=2587","title":{"rendered":"non-fast-forward updates were rejected\uff0cGit\u9047\u5230\u8fd9\u4e2a\u95ee\u9898\u5982\u4f55\u89e3\u51b3"},"content":{"rendered":"

\u9047\u5230\u95ee\u9898\uff1a
\n git push origin master<\/p>\n

! [rejected] master -> master (non-fast-forward)
\nerror: failed to push some refs to ‘ ‘
\nTo prevent you from losing history, non-fast-forward updates were rejected
\nMerge the remote changes (e.g. ‘git pull’) before pushing again. See the
\n‘Note about fast-forwards’ section of ‘git push –help’ for details. <\/p>\n

\u89e3\u51b3\u65b9\u6cd5\uff0c\u5148\u628agit\u7684\u4e1c\u897ffetch\u5230\u672c\u5730\uff0c\u7136\u540emerge\u540e\u518dpush
\ngit fetch origin master<\/span> git merge origin master
\n$ git push origin master<\/p>\n

\u6216\u8005Git\u653e\u5f03\u672c\u5730\u4fee\u6539\uff0c\u5f3a\u5236\u66f4\u65b0\u540e\uff0c\u7136\u540e\u518d\u4e0a\u4f20\uff08\u5148\u624b\u52a8\u5907\u4efd\u4fee\u6539\u5185\u5bb9\uff09
\ngit fetch –all
\ngit reset –hard origin\/master
\ngit pull <\/p>\n

git fetch \u6307\u4ee4\u662f\u4e0b\u8f7d\u8fdc\u7a0b\u4ed3\u5e93\u6700\u65b0\u5185\u5bb9\uff0c\u4e0d\u505a\u5408\u5e76
\ngit reset \u6307\u4ee4\u628aHEAD\u6307\u5411master\u6700\u65b0\u7248\u672c\uff0corigin\/master\u53ef\u66ff\u6362\u4e3a\u8981\u62c9\u53d6\u7684\u8fdc\u7a0b\u5206\u652f\u540d\u79f0 <\/p>\n","protected":false},"excerpt":{"rendered":"

\u9047\u5230\u95ee\u9898\uff1a git push origin master ! [rejected] master -> […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[8],"tags":[],"class_list":["post-2587","post","type-post","status-publish","format-standard","hentry","category-embedded"],"_links":{"self":[{"href":"http:\/\/www.51cos.com\/index.php?rest_route=\/wp\/v2\/posts\/2587","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/www.51cos.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/www.51cos.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/www.51cos.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/www.51cos.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=2587"}],"version-history":[{"count":1,"href":"http:\/\/www.51cos.com\/index.php?rest_route=\/wp\/v2\/posts\/2587\/revisions"}],"predecessor-version":[{"id":2588,"href":"http:\/\/www.51cos.com\/index.php?rest_route=\/wp\/v2\/posts\/2587\/revisions\/2588"}],"wp:attachment":[{"href":"http:\/\/www.51cos.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=2587"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/www.51cos.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=2587"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/www.51cos.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=2587"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}