{"id":645,"date":"2021-02-25T16:49:00","date_gmt":"2021-02-25T08:49:00","guid":{"rendered":"https:\/\/www.caiqinyi.cn\/?p=645"},"modified":"2022-08-17T15:05:11","modified_gmt":"2022-08-17T07:05:11","slug":"git_commit_process","status":"publish","type":"post","link":"https:\/\/www.caiqinyi.cn\/index.php\/2021\/02\/25\/git_commit_process\/","title":{"rendered":"\u9879\u76ee\u4ee3\u7801\u63d0\u4ea4git\u5168\u6d41\u7a0b\u603b\u7ed3(\u975e\u6cc4\u5bc6!!!)"},"content":{"rendered":"

\u6bcf\u6b21\u6539\u5b8c\u5f15\u64ce\u4ee3\u7801\u8981\u63d0\u4ea4merge request(\u4ee5\u4e0b\u7b80\u79f0mr) \u65f6\u90fd\u611f\u89c9\u81ea\u5df1\u624b\u5fd9\u811a\u4e71\u7684, \u9700\u8981\u5404\u79cd\u7f51\u4e0a\u67e5, \u56e0\u6b64\u7528\u672c\u6587\u8bb0\u5f55\u4e00\u4e0b\u6d41\u7a0b, \u975e\u6cc4\u5bc6\u6587!!!<\/p>\n

<\/p>\n

1. \u5408\u5e76\u81ea\u5df1\u7684\u5f00\u53d1\u5206\u652f(\u5047\u8bbe\u53ebdev) \u7684commit.<\/p>\n

\u5728\u5f00\u53d1\u8fc7\u7a0b\u4e2d\u514d\u4e0d\u4e86\u4f1a\u5728\u4e00\u4e2a\u529f\u80fd\u5f00\u53d1\u70b9\u4e0a\u4ea7\u751f\u591a\u4e2acommit, \u56e0\u6b64\u9700\u8981\u5728\u63d0\u4ea4mr\u4e4b\u524d\u8fdb\u884c\u5408\u5e76, <\/p>\n

\r\ngit rebase -i HEAD~x\r\n<\/pre>\n
\u5176\u4e2dx\u8868\u793a\u76f8\u5173\u7684commit\u6570\u91cf. \u8f93\u5b8c\u8be5\u6307\u4ee4\u4ee5\u540e\u4f1a\u5f39\u51fa\u4e00\u4e2a\u7f16\u8f91\u7a97\u53e3, \u4e00\u822c\u6765\u8bf4\u628a\u7b2c\u4e00\u6761commit\u8bb0\u5f55\u6807\u8bb0\u4e3apick(\u76f4\u63a5\u6807\u8bb0\u4e3ap\u4e5f\u53ef\u4ee5), \u540e\u9762\u7684commit\u8bb0\u5f55\u5747\u6807\u8bb0\u4e3as, \u8868\u793a\u628a\u7b2c\u4e8c\u6761\u4ee5\u540e\u7684commit\u90fd\u5f80\u7b2c\u4e00\u6761commit\u4e0a\u5408\u5e76.
\n\u5982\u679c\u4e0d\u505a\u672c\u6b65\u9aa4, \u540e\u9762\u5728\u5f80\u5176\u5b83\u5206\u652frebase\u7684\u65f6\u5019\u4f1a\u628a\u81ea\u5df1\u7684\u591a\u6761commit\u8bb0\u5f55\u4e5f\u7ed9rebase\u8fc7\u53bb, \u5bfc\u81f4\u63d0\u4ea4mr\u65f6\u81ea\u5df1\u7684commit\u8bb0\u5f55\u5f88\u4e71.<\/p>\n
2. \u4fee\u6539\u6700\u540e\u4e00\u6b21commit\u4fe1\u606f.<\/p>\n
\r\ngit commit --amend\r\n<\/pre>\n
3. \u521b\u5efa\u63d0\u4ea4\u5206\u652f.<\/p>\n
\r\ngit checkout -b commitXXXX\r\ngit fetch upstream master\r\ngit reset --hard FETCH_HEAD\r\n<\/pre>\n
\u5176\u4e2dcommitXXXX\u662f\u63d0\u4ea4\u5206\u652f\u7684\u540d\u5b57, \u8fd9\u6837\u7684\u547d\u540d\u65b9\u5f0f\u5c5e\u4e8e\u4e2a\u4eba\u4e60\u60ef\u53ed, \u4e5f\u662f\u5bfc\u5e08\u6559\u6211\u7684, XXXX\u662f\u65e5\u671f. \u901a\u8fc7\u4e0a\u8ff0\u4e09\u884cgit\u547d\u4ee4\u4fbf\u53ef\u4ee5\u521b\u5efa\u51fa\u4e00\u6761\u6700\u65b0\u7684\u5e72\u51c0\u5206\u652f.<\/p>\n
4. rebase.<\/p>\n
\r\ngit checkout dev\r\ngit rebase commitXXXX\r\n<\/pre>\n
\u6267\u884c\u4e0a\u8ff0\u4e24\u884cgit\u547d\u4ee4\u4ee5\u540e\u4fbf\u53d8\u57fa\u6210\u529f\u4e86, \u82e5\u4e2d\u95f4\u53d1\u751f\u51b2\u7a81, \u5219\u53ef\u4ee5\u5728\u89e3\u51b3\u5b8c\u51b2\u7a81\u4ee5\u540e, \u91cd\u65b0\u4f7f\u7528git add\u547d\u4ee4\u628a\u6539\u52a8\u6dfb\u52a0\u56de\u6765, \u7136\u540e\u4f7f\u7528\u4e0b\u8ff0\u547d\u4ee4\u7ee7\u7eedrebase.<\/p>\n
\r\ngit rebase --continue\r\n<\/pre>\n
5. merge.<\/p>\n
\u5728rebase\u5b8c\u4ee5\u540edev\u5206\u652f\u7684\u6539\u52a8\u4fbf\u90fd\u4f1a\u79fb\u52a8\u5230commitXXXX\u5206\u652f\u7684\u6539\u52a8\u4e4b\u540e, \u56e0\u4e3a\u662f\u987a\u5e8f\u7684\u6539\u52a8\u63d0\u4ea4, \u6240\u4ee5\u63a5\u4e0b\u6765\u7684merge\u5e94\u8be5\u4e0d\u4f1a\u4ea7\u751f\u65b0\u7684merge\u63d0\u4ea4.<\/p>\n
\r\ngit checkout commitXXXX\r\ngit merge dev\r\ngit push origin commitXXXX\r\n<\/pre>\n
\u81f3\u6b64, \u5c31\u662f\u4e00\u4e2a\u5b8c\u6574\u7684\u51c6\u5907\u7528\u4e8e\u63d0\u4ea4mr\u7684\u63d0\u4ea4\u5206\u652f\u7684\u6d41\u7a0b\u4e86. \u540e\u7eed\u82e5\u5728\u63d0\u4ea4mr\u8fc7\u7a0b\u4e2d\u9047\u5230\u4ec0\u4e48\u65b0\u7684\u95ee\u9898, \u4f1a\u7ee7\u7eed\u66f4\u65b0\u672c\u6587\u628a\u95ee\u9898\u8bb0\u5f55\u4e0b\u6765~(\uff3e\uff0d\uff3e)V<\/p>\n","protected":false},"excerpt":{"rendered":"
\u6bcf\u6b21\u6539\u5b8c\u5f15\u64ce\u4ee3\u7801\u8981\u63d0\u4ea4merge request(\u4ee5\u4e0b\u7b80\u79f0mr) \u65f6\u90fd\u611f\u89c9\u81ea\u5df1\u624b\u5fd9\u811a\u4e71\u7684, \u9700\u8981\u5404\u79cd\u7f51\u4e0a\u67e5,  … \u7ee7\u7eed\u9605\u8bfb\u9879\u76ee\u4ee3\u7801\u63d0\u4ea4git\u5168\u6d41\u7a0b\u603b\u7ed3(\u975e\u6cc4\u5bc6!!!)<\/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\/645"}],"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=645"}],"version-history":[{"count":4,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/posts\/645\/revisions"}],"predecessor-version":[{"id":649,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/posts\/645\/revisions\/649"}],"wp:attachment":[{"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/media?parent=645"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/categories?post=645"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/tags?post=645"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}