{"id":43792,"date":"2023-12-11T15:00:54","date_gmt":"2023-12-11T07:00:54","guid":{"rendered":"https:\/\/wx.kaifamiao.info\/?p=43792"},"modified":"2023-12-11T15:00:54","modified_gmt":"2023-12-11T07:00:54","slug":"%e8%af%b7%e4%bd%a0%e5%9b%9e%e7%ad%94%e4%b8%80%e4%b8%8bgit%e4%b8%admerge%e5%92%8crebase%e5%8c%ba%e5%88%ab%ef%bc%9f-3","status":"publish","type":"post","link":"http:\/\/wx.kaifamiao.info\/index.php\/2023\/12\/11\/%e8%af%b7%e4%bd%a0%e5%9b%9e%e7%ad%94%e4%b8%80%e4%b8%8bgit%e4%b8%admerge%e5%92%8crebase%e5%8c%ba%e5%88%ab%ef%bc%9f-3\/","title":{"rendered":"\u8bf7\u4f60\u56de\u7b54\u4e00\u4e0bgit\u4e2dMerge\u548crebase\u533a\u522b\uff1f"},"content":{"rendered":"<p>&#8220;`&#8221;                    Merge\u4f1a\u81ea\u52a8\u6839\u636e\u4e24\u4e2a\u5206\u652f\u7684\u5171\u540c\u7956\u5148\u548c\u4e24\u4e2a\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4 \u8fdb\u884c\u4e00\u4e2a\u4e09\u65b9\u5408\u5e76\uff0c\u7136\u540e\u5c06\u5408\u5e76\u4e2d\u4fee\u6539\u7684\u5185\u5bb9\u751f\u6210\u4e00\u4e2a\u65b0\u7684 commit\uff0c\u5373merge\u5408\u5e76\u4e24\u4e2a\u5206\u652f\u5e76\u751f\u6210\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4,\u5e76\u4e14\u4ecd\u7136\u540e\u4fdd\u5b58\u539f\u6765\u5206\u652f\u7684commit\u8bb0\u5f55<\/p>\n<p>Rebase\u4f1a\u4ece\u4e24\u4e2a\u5206\u652f\u7684\u5171\u540c\u7956\u5148\u5f00\u59cb\u63d0\u53d6\u5f53\u524d\u5206\u652f\u4e0a\u7684\u4fee\u6539\uff0c\u7136\u540e\u5c06\u5f53\u524d\u5206\u652f\u4e0a\u7684\u6240\u6709\u4fee\u6539\u5408\u5e76\u5230\u76ee\u6807\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\u540e\u9762\uff0c\u5982\u679c\u63d0\u53d6\u7684\u4fee\u6539\u6709\u591a\u4e2a\uff0c\u90a3git\u5c06\u4f9d\u6b21\u5e94\u7528\u5230\u6700\u65b0\u7684\u63d0\u4ea4\u540e\u9762\u3002Rebase\u540e\u53ea\u5269\u4e0b\u4e00\u4e2a\u5206\u652f\u7684commit\u8bb0\u5f55<\/p>\n<p>&lt;pre&gt;&lt;code&gt;            &quot;&#8220;`<br \/>\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"<p>&#8220;`&#8221; Merge\u4f1a\u81ea\u52a8\u6839\u636e\u4e24\u4e2a\u5206\u652f\u7684\u5171\u540c\u7956\u5148\u548c\u4e24\u4e2a\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4 \u8fdb\u884c\u4e00\u4e2a\u4e09\u65b9\u5408\u5e76\uff0c [&hellip;]<\/p>\n","protected":false},"author":7,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[101],"tags":[],"class_list":["post-43792","post","type-post","status-publish","format-standard","hentry","category-c"],"_links":{"self":[{"href":"http:\/\/wx.kaifamiao.info\/index.php\/wp-json\/wp\/v2\/posts\/43792","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/wx.kaifamiao.info\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/wx.kaifamiao.info\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/wx.kaifamiao.info\/index.php\/wp-json\/wp\/v2\/users\/7"}],"replies":[{"embeddable":true,"href":"http:\/\/wx.kaifamiao.info\/index.php\/wp-json\/wp\/v2\/comments?post=43792"}],"version-history":[{"count":1,"href":"http:\/\/wx.kaifamiao.info\/index.php\/wp-json\/wp\/v2\/posts\/43792\/revisions"}],"predecessor-version":[{"id":43793,"href":"http:\/\/wx.kaifamiao.info\/index.php\/wp-json\/wp\/v2\/posts\/43792\/revisions\/43793"}],"wp:attachment":[{"href":"http:\/\/wx.kaifamiao.info\/index.php\/wp-json\/wp\/v2\/media?parent=43792"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/wx.kaifamiao.info\/index.php\/wp-json\/wp\/v2\/categories?post=43792"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/wx.kaifamiao.info\/index.php\/wp-json\/wp\/v2\/tags?post=43792"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}