{"id":46,"date":"2024-10-21T16:18:49","date_gmt":"2024-10-21T08:18:49","guid":{"rendered":"https:\/\/pony.freeopen.cc\/blog\/?p=46"},"modified":"2024-10-21T17:23:35","modified_gmt":"2024-10-21T09:23:35","slug":"git%e5%88%87%e5%88%86%e6%94%af%e5%90%8c%e6%ad%a5%e6%94%b9%e5%8a%a8%e4%bb%a3%e7%a0%81","status":"publish","type":"post","link":"https:\/\/pony.freeopen.cc\/blog\/?p=46","title":{"rendered":"git\u5207\u5206\u652f\u540c\u6b65\u6539\u52a8\u4ee3\u7801"},"content":{"rendered":"\n<p>\u573a\u666f\uff1a<\/p>\n\n\n\n<p>\u5982\u679c\u4f60\u5728\u4e00\u4e2a\u9519\u8bef\u7684\u5206\u652f\u4e0a\u505a\u4e86\u4e00\u4e9b\u4ee3\u7801\u6539\u52a8\uff0c\u4f46\u5e0c\u671b\u8fd9\u4e9b\u6539\u52a8\u540c\u6b65\u5230\u6b63\u786e\u7684\u5206\u652f\u4e0a\uff0c\u6b63\u786e\u505a\u6cd5\u3002<\/p>\n\n\n\n<p>\u5904\u7406\u65b9\u6848\uff1a<\/p>\n\n\n\n<p>1 \u8fd8\u672a\u63d0\u4ea4\u6539\u52a8\u5904\u7406\u65b9\u5f0f<\/p>\n\n\n\n<p><code>\u4fdd\u5b58\u5f53\u524d\u6539\u52a8\u5230\u5806\u6808 git stash<\/code><\/p>\n\n\n\n<p>\u5207\u6362\u5230\u6b63\u786e\u5206\u652f git checkout &lt;correct-branch&gt;<\/p>\n\n\n\n<p>\u4fdd\u5b58\u7684\u6539\u52a8\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f git stash pop<\/p>\n\n\n\n<p>2 \u5df2\u7ecfcommit\u6539\u52a8\u5904\u7406\u65b9\u5f0f<\/p>\n\n\n\n<p>\u67e5\u770b\u5386\u53f2\uff0c\u627e\u5230commit\u7684SHA-1\u503c git log<\/p>\n\n\n\n<p>\u5207\u6362\u5230\u6b63\u786e\u5206\u652f git checkout &lt;correct-branch&gt;<\/p>\n\n\n\n<p>\u5c06commit\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f git cherry-pick &lt;commit-sha-1&gt;<\/p>\n\n\n\n<p>3 \u4e00\u4e2a\u7b28\u529e\u6cd5 \uff08\u6539\u52a8\u592a\u591a\u4e0d\u9002\u5408\uff09<\/p>\n\n\n\n<p>\u76f4\u63a5\u5207\u5206\u652f\uff0c\u624b\u52a8\u590d\u5236\u6539\u52a8<\/p>\n\n\n\n<p><\/p>\n\n\n\n<p><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u573a\u666f\uff1a \u5982\u679c\u4f60\u5728\u4e00\u4e2a\u9519\u8bef\u7684\u5206\u652f\u4e0a\u505a\u4e86\u4e00\u4e9b\u4ee3\u7801\u6539\u52a8\uff0c\u4f46\u5e0c\u671b\u8fd9\u4e9b\u6539\u52a8\u540c\u6b65\u5230\u6b63\u786e\u7684\u5206\u652f\u4e0a\uff0c\u6b63\u786e\u505a\u6cd5\u3002 \u5904\u7406\u65b9\u6848\uff1a 1 &#8230; <a title=\"git\u5207\u5206\u652f\u540c\u6b65\u6539\u52a8\u4ee3\u7801\" class=\"read-more\" href=\"https:\/\/pony.freeopen.cc\/blog\/?p=46\" aria-label=\"\u9605\u8bfb git\u5207\u5206\u652f\u540c\u6b65\u6539\u52a8\u4ee3\u7801\">\u9605\u8bfb\u66f4\u591a<\/a><\/p>\n","protected":false},"author":3,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[5],"tags":[],"class_list":["post-46","post","type-post","status-publish","format-standard","hentry","category-tech"],"_links":{"self":[{"href":"https:\/\/pony.freeopen.cc\/blog\/index.php?rest_route=\/wp\/v2\/posts\/46","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/pony.freeopen.cc\/blog\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/pony.freeopen.cc\/blog\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/pony.freeopen.cc\/blog\/index.php?rest_route=\/wp\/v2\/users\/3"}],"replies":[{"embeddable":true,"href":"https:\/\/pony.freeopen.cc\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=46"}],"version-history":[{"count":2,"href":"https:\/\/pony.freeopen.cc\/blog\/index.php?rest_route=\/wp\/v2\/posts\/46\/revisions"}],"predecessor-version":[{"id":48,"href":"https:\/\/pony.freeopen.cc\/blog\/index.php?rest_route=\/wp\/v2\/posts\/46\/revisions\/48"}],"wp:attachment":[{"href":"https:\/\/pony.freeopen.cc\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=46"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/pony.freeopen.cc\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=46"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/pony.freeopen.cc\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=46"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}