{"id":7479,"date":"2015-07-09T20:15:02","date_gmt":"2015-07-09T12:15:02","guid":{"rendered":"http:\/\/jpuyy.com\/?p=7479"},"modified":"2015-07-09T20:15:15","modified_gmt":"2015-07-09T12:15:15","slug":"git-your-branch-and-originmaster-have-diverged","status":"publish","type":"post","link":"https:\/\/jpuyy.com\/?p=7479","title":{"rendered":"git Your branch and &#8216;origin\/master&#8217; have diverged"},"content":{"rendered":"<p class=\"p1\">On branch master<\/p>\n<p class=\"p1\">Your branch and &#8216;origin\/master&#8217; have diverged,<\/p>\n<p class=\"p1\">and have 7 and 8 different commits each, respectively.<\/p>\n<p class=\"p1\">\u5904\u7406\u65b9\u6cd5<\/p>\n<p class=\"p1\">git rebase origin\/master<\/p>\n","protected":false},"excerpt":{"rendered":"<p>On branch master Your branch and &#8216;origin\/master&#8217; have diverged, and have 7 and 8 different commits each, respectively. \u5904\u7406\u65b9\u6cd5 git rebase origin\/master<\/p>\n","protected":false},"author":3,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[168],"tags":[],"class_list":["post-7479","post","type-post","status-publish","format-standard","hentry","category-git"],"_links":{"self":[{"href":"https:\/\/jpuyy.com\/index.php?rest_route=\/wp\/v2\/posts\/7479","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/jpuyy.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/jpuyy.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/jpuyy.com\/index.php?rest_route=\/wp\/v2\/users\/3"}],"replies":[{"embeddable":true,"href":"https:\/\/jpuyy.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=7479"}],"version-history":[{"count":2,"href":"https:\/\/jpuyy.com\/index.php?rest_route=\/wp\/v2\/posts\/7479\/revisions"}],"predecessor-version":[{"id":7481,"href":"https:\/\/jpuyy.com\/index.php?rest_route=\/wp\/v2\/posts\/7479\/revisions\/7481"}],"wp:attachment":[{"href":"https:\/\/jpuyy.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=7479"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/jpuyy.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=7479"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/jpuyy.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=7479"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}