{"id":641,"date":"2020-12-25T19:01:36","date_gmt":"2020-12-25T11:01:36","guid":{"rendered":"https:\/\/www.caiqinyi.cn\/?p=641"},"modified":"2020-12-25T19:01:36","modified_gmt":"2020-12-25T11:01:36","slug":"git_rebase","status":"publish","type":"post","link":"https:\/\/www.caiqinyi.cn\/index.php\/2020\/12\/25\/git_rebase\/","title":{"rendered":"git rebase\u5c0f\u8bb0"},"content":{"rendered":"<p>\u5feb\u901f\u8bb0\u5f55\u4e00\u4e0b, \u56e0\u4e3a\u5dee\u4e0d\u591a\u8981\u53bb\u627e\u5973\u76c6\u53cb\u73a9\u4e86\u989d.<\/p>\n<p>\u5f00\u53d1\u65f6\u6700\u597d\u5728\u81ea\u5df1\u7684\u5206\u652f\u4e0a\u8fdb\u884c\u6539\u52a8, \u6211\u4eec\u8fd9\u91cc\u4e0d\u59a8\u8bbe\u4e3adev\u5206\u652f, \u4e3b\u5e72\u5206\u652f\u662fmaster\u5206\u652f, \u5f53\u8981\u63d0\u4ea4\u6539\u52a8\u65f6, \u9700\u8981\u8fdb\u884c\u5982\u4e0b\u6b65\u9aa4\u4fdd\u8bc1commit\u8bb0\u5f55\u7684\u6574\u6d01:<\/p>\n<p>1. \u5728dev\u5206\u652f\u4e0a\u5408\u5e76\u5f85\u63d0\u4ea4\u529f\u80fd\u7684\u6240\u6709\u76f8\u5173commit\u8bb0\u5f55;(\u5207\u8bb0\u4e0d\u8981\u63d0\u4ea4\u5230\u8fdc\u7aef)<\/p>\n<p>2. \u62c9\u53d6master\u5206\u652f\u6700\u65b0\u6539\u52a8;<\/p>\n<p>3. \u5207\u5230master\u5206\u652f\u5c06master\u5206\u652f\u4e0a\u7684\u6539\u52a8rebase\u5230dev\u5206\u652f\u4e0a;<\/p>\n<p>4. \u5207\u5230dev\u5206\u652f\u4e0a\u518d\u5c06dev\u5206\u652f\u4e0a\u7684\u6539\u52a8rebase\u5230master\u5206\u652f\u4e0a;<\/p>\n<p>5. \u6700\u540e\u5207\u56demaster\u5206\u652f\u8fdb\u884cpush\u5373\u53ef.<\/p>\n<p>\u641e\u6382\u8d70\u94f6\uff01\uff01\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u5feb\u901f\u8bb0\u5f55\u4e00\u4e0b, \u56e0\u4e3a\u5dee\u4e0d\u591a\u8981\u53bb\u627e\u5973\u76c6\u53cb\u73a9\u4e86\u989d. \u5f00\u53d1\u65f6\u6700\u597d\u5728\u81ea\u5df1\u7684\u5206\u652f\u4e0a\u8fdb\u884c\u6539\u52a8, \u6211\u4eec\u8fd9\u91cc\u4e0d\u59a8\u8bbe\u4e3adev\u5206\u652f &hellip; <a href=\"https:\/\/www.caiqinyi.cn\/index.php\/2020\/12\/25\/git_rebase\/\" class=\"more-link\">\u7ee7\u7eed\u9605\u8bfb<span class=\"screen-reader-text\">git rebase\u5c0f\u8bb0<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[11],"tags":[],"_links":{"self":[{"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/posts\/641"}],"collection":[{"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/comments?post=641"}],"version-history":[{"count":1,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/posts\/641\/revisions"}],"predecessor-version":[{"id":644,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/posts\/641\/revisions\/644"}],"wp:attachment":[{"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/media?parent=641"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/categories?post=641"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/tags?post=641"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}