{"id":17107,"date":"2025-04-07T13:30:07","date_gmt":"2025-04-07T05:30:07","guid":{"rendered":"https:\/\/92it.top\/?p=17107"},"modified":"2025-04-07T13:30:07","modified_gmt":"2025-04-07T05:30:07","slug":"git-%ef%bd%9c%e4%b8%ba%e4%bb%80%e4%b9%88%e5%8f%abpull-request-%e8%80%8c%e4%b8%8d%e6%98%afpush-request%ef%bc%9f","status":"publish","type":"post","link":"https:\/\/92it.top\/?p=17107","title":{"rendered":"Git \uff5c\u4e3a\u4ec0\u4e48\u53ebpull request \u800c\u4e0d\u662fpush request\uff1f"},"content":{"rendered":"\n<p>274 \u4eba\u8d5e\u540c\u4e86\u8be5\u6587\u7ae0<\/p>\n\n\n\n<p>\u5728\u56e2\u961f\u4e2d\u6211\u627f\u62c5\u4e86Committer \u7684\u8d23\u4efb\uff0c\u4e5f\u5c31\u662f\u5e2e\u540c\u4e8b\u4eec\u68c0\u89c6\u4ee3\u7801\uff08Code<a href=\"https:\/\/zhida.zhihu.com\/search?content_id=165445252&amp;content_type=Article&amp;match_order=1&amp;q=Code+Review&amp;zd_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ6aGlkYV9zZXJ2ZXIiLCJleHAiOjE3NDQxNzQ0MzIsInEiOiJDb2RlIFJldmlldyIsInpoaWRhX3NvdXJjZSI6ImVudGl0eSIsImNvbnRlbnRfaWQiOjE2NTQ0NTI1MiwiY29udGVudF90eXBlIjoiQXJ0aWNsZSIsIm1hdGNoX29yZGVyIjoxLCJ6ZF90b2tlbiI6bnVsbH0.Rqcp9yl0eewPzKlN-OAcpXL-A-8Nu84jkQKInCMb2vw&amp;zhida_source=entity\" target=\"_blank\" rel=\"noreferrer noopener\"> <\/a>Review\uff09\u548c\u5408\u5165\u4ee3\u7801\uff0c\u7ecf\u5e38\u542c\u5230\u6709\u540c\u4e8b\u5728\u7fa4\u91cc\u558a\uff1a\u201c\u5927\u4f6c\uff0c\u5e2e\u6211\u5408\u4e2a PR\u201d\uff0c\u201c\u5927\u4f6c\uff0c\u6211\u521a\u63d0\u4ea4\u4e86\u4e00\u4e2a MR\uff0c\u5e2e\u5fd9\u5408\u4e00\u4e0b\uff0c\u6025\u7740\u51fa\u8865\u4e01\u201d\u3002\u6211\u6709\u70b9\u61f5\u4e86\uff0cPR \u548c MR \u5230\u5e95\u54ea\u4e2a\u624d\u662f\u6b63\u786e\u7684\uff0c\u8fd9\u4e24\u4e2a\u5230\u5e95\u6709\u4ec0\u4e48\u533a\u522b\uff0c\u6211\u51b3\u5b9a\u5148\u641e\u6e05\u695a\u8fd9\u4e24\u4e2a\u6982\u5ff5\u518d\u5408\u5165\u4ed6\u4eec\u7684\u4ee3\u7801\u3002<\/p>\n\n\n\n<p><strong>\u4ec0\u4e48\u662fPull Request\uff1f<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p>PR \u7684\u5168\u79f0\u662fPull Request\uff0c\u7ecf\u5e38\u7528 Github\u7684\u540c\u5b66\u5bf9\u8fd9\u4e2a\u80af\u5b9a\u5f88\u719f\u6089\u4e86\u3002Github \u805a\u96c6\u4e864000\u4e07\u5f00\u53d1\u8005\uff0c\u8fc7\u4ebf\u7684\u5f00\u6e90\u9879\u76ee\uff0c\u5982\u679c\u60f3\u7ed9\u522b\u4eba\u7684\u5f00\u6e90\u4ed3\u5e93\u8d21\u732e\u4ee3\u7801\uff0c\u901a\u5e38\u662f\u5148 fork \u522b\u4eba\u7684\u9879\u76ee\uff0c\u7136\u540e\u672c\u5730\u4fee\u6539\u5b8c\u6210\u63d0\u4ea4\u5230\u81ea\u5df1\u7684\u4e2a\u4eba fork \u4ed3\u5e93\uff0c\u6700\u540e\u63d0\u4ea4 PR \u7b49\u5f85\u522b\u4eba\u5408\u5165\u4f60\u7684\u4ee3\u7801\u3002<\/p>\n\n\n\n<p>Github \u7684\u5de5\u4f5c\u6d41\uff1a<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" decoding=\"async\" width=\"1022\" height=\"1024\" src=\"https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-63-1022x1024.png\" alt=\"\" class=\"wp-image-17109\" style=\"width:448px;height:auto\" srcset=\"https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-63-1022x1024.png 1022w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-63-300x300.png 300w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-63-150x150.png 150w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-63-768x769.png 768w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-63-830x831.png 830w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-63-230x230.png 230w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-63-350x351.png 350w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-63-480x481.png 480w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-63.png 1322w\" sizes=\"(max-width: 1022px) 100vw, 1022px\" \/><\/figure><\/div>\n\n\n<p>\u6211\u4eec\u91cd\u70b9\u770b\u4e00\u4e0b\u7b2c6\u6b65\uff0c\u5c0f\u660e\u5199\u5b8c\u4ee3\u7801\u4e86\u60f3\u5408\u5165\u5230\u539f\u4f5c\u8005\u7684\u4ed3\u5e93\uff0c\u65b0\u5efa\u4e86\u4e00\u4e2a\u201cpull request\u201d\uff0c\u62c9\u8bf7\u6c42\uff1f\u8fd9\u660e\u660e\u662f\u63a8\u554a\uff0c\u5c0f\u660e\u5c06\u81ea\u5df1\u7684\u4fee\u6539\u63a8\u5230\u539f\u4f5c\u8005\u7684\u4ed3\uff0c\u611f\u89c9\u53eb\u201cpush request\u201d\u6bd4\u8f83\u5408\u9002\u5427\u3002<\/p>\n\n\n\n<p>\u65e2\u7136 Github \u575a\u6301\u53eb\u201cpull request\u201d\uff0c\u6211\u4eec\u8bd5\u7740\u7406\u89e3\u4e00\u4e0b\u5b83\u7684\u601d\u8def\uff0c\u5c0f\u660e\u5199\u5b8c\u4ee3\u7801\u4e86\u5fc3\u91cc\u80af\u5b9a\u662f\u5728\u60f3\uff1a\u539f\u4f5c\u8005\u5927\u795e\uff0c\u6211\u6539\u4e86\u70b9\u4e1c\u897f\uff0c\u4f60\u5feb\u628a\u6211\u7684\u4fee\u6539\u62c9\u56de\u53bb\u5427\u3002\u7ad9\u5728\u539f\u4f5c\u8005\u7684\u89d2\u5ea6\u601d\u8003\uff0c\u53ebpull request\u597d\u50cf\u4e5f\u8bf4\u5f97\u8fc7\u53bb\uff0c\u6bcf\u5929\u6709\u5927\u91cf\u7684\u4eba\u4ece\u6211\u8fd9\u91cc fork \u4ee3\u7801\u8d70\uff0c\u6211\u53ea\u4f1a\u62c9\u53d6\u6211\u611f\u5174\u8da3\u7684\u4ee3\u7801\u56de\u6765\u3002<\/p>\n\n\n\n<p>\u6211\u4e00\u76f4\u89c9\u5f97\u4e0e\u5176\u53ebpull request\uff0c push request \u542c\u8d77\u6765\u66f4\u52a0\u76f4\u89c2\uff0c\u540e\u6765\u53d1\u73b0\u5b83\u7684\u547d\u540d\u6709\u5176\u80cc\u540e\u7684\u539f\u56e0\u548c\u903b\u8f91\u3002<\/p>\n\n\n\n<p><strong>Pull Request \u7684\u547d\u540d\u7531\u6765<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<ul>\n<li>\u4ece\u63a5\u6536\u8005\u7684\u89d2\u5ea6\u547d\u540d\uff1apull request \u662f\u4ece\u4ee3\u7801\u5e93\u7ef4\u62a4\u8005\u6216\u9879\u76ee\u6240\u6709\u8005\u7684\u89d2\u5ea6\u547d\u540d\u7684\u3002\u6211\u4eec\u6b63\u5728\u8bf7\u6c42\u4ed6\u4eec\u201cpull\u201d\uff08\u62c9\u53d6\uff09\u6211\u4eec\u7684\u66f4\u6539\u5e76\u5c06\u5176\u5408\u5e76\u5230\u4ed6\u4eec\u7684\u4ee3\u7801\u5e93\u4e2d\u3002\u56e0\u6b64\uff0c\u5b83\u5f3a\u8c03\u7684\u662f\u8bf7\u6c42\u63a5\u6536\u8005\u91c7\u53d6\u884c\u52a8\u6765\u62c9\u53d6\u4f60\u7684\u66f4\u6539\u3002<\/li>\n\n\n\n<li>Git \u5de5\u4f5c\u6d41\u7a0b\uff1a\u5728 Git \u7684\u5de5\u4f5c\u6d41\u7a0b\u4e2d\uff0cpull \u64cd\u4f5c\u6307\u7684\u662f\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u62c9\u53d6\u4ee3\u7801\u5230\u672c\u5730\u3002pull request \u8fd9\u4e00\u540d\u79f0\u53cd\u6620\u4e86\u8fd9\u4e00\u70b9\uff0c\u5373\u6211\u4eec\u8bf7\u6c42\u9879\u76ee\u7ef4\u62a4\u8005\u4ece\u4f60\u7684\u5206\u652f\u62c9\u53d6\u4ee3\u7801\u5e76\u5408\u5e76\u5230\u4ed6\u4eec\u7684\u5206\u652f\u3002<\/li>\n\n\n\n<li>\u8bf7\u6c42\u800c\u975e\u5f3a\u5236\uff1apull request \u8868\u660e\u4f60\u662f\u8bf7\u6c42\u5408\u5e76\u66f4\u6539\uff0c\u800c\u4e0d\u662f\u5f3a\u5236\u6027\u5730\u63a8\u9001\u66f4\u6539\u3002\u9879\u76ee\u7ef4\u62a4\u8005\u6709\u6743\u5ba1\u67e5\u3001\u8ba8\u8bba\u5e76\u6700\u7ec8\u51b3\u5b9a\u662f\u5426\u63a5\u53d7\u4f60\u7684\u66f4\u6539\u3002\u8fd9\u79cd\u65b9\u5f0f\u5f3a\u8c03\u534f\u4f5c\u548c\u4ee3\u7801\u5ba1\u67e5\uff0c\u800c\u4e0d\u662f\u5355\u65b9\u9762\u7684\u66f4\u6539\u3002<br><\/li>\n<\/ul>\n\n\n\n<p><strong>\u4e3a\u4ec0\u4e48\u4e0d\u53eb Push Request\uff1f<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<ul>\n<li>Push \u662f\u5355\u65b9\u9762\u7684\u64cd\u4f5c\uff1a\u5728 Git \u4e2d\uff0cpush \u662f\u5c06\u672c\u5730\u66f4\u6539\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u7684\u4e00\u79cd\u64cd\u4f5c\u3002\u5b83\u662f\u5355\u5411\u7684\uff0c\u4e0d\u9700\u8981\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5373\u65f6\u4ea4\u4e92\u6216\u540c\u610f\u3002\u4f7f\u7528 push request \u53ef\u80fd\u4f1a\u8bef\u5bfc\u4eba\u4eec\u8ba4\u4e3a\u66f4\u6539\u4f1a\u88ab\u76f4\u63a5\u63a8\u9001\u5e76\u5e94\u7528\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u800c\u4e0d\u9700\u8981\u5ba1\u67e5\u3002<\/li>\n\n\n\n<li>\u5f3a\u8c03\u534f\u4f5c\u548c\u5ba1\u67e5\uff1apull request \u5f3a\u8c03\u7684\u662f\u4e00\u4e2a\u534f\u4f5c\u7684\u8fc7\u7a0b\uff0c\u5305\u62ec\u4ee3\u7801\u5ba1\u67e5\u3001\u8ba8\u8bba\u548c\u6700\u7ec8\u7684\u5408\u5e76\u51b3\u7b56\u3002\u5b83\u4e0d\u4ec5\u4ec5\u662f\u63d0\u4ea4\u66f4\u6539\uff0c\u66f4\u91cd\u8981\u7684\u662f\u5728\u56e2\u961f\u4e2d\u534f\u4f5c\u548c\u786e\u4fdd\u4ee3\u7801\u8d28\u91cf\u3002<br><\/li>\n<\/ul>\n\n\n\n<p><strong>Git\u4e2d\u7684&#8221;pull request&#8221;\u771f\u6b63\u6bd4\u8f83\u7684\u662f\u4ec0\u4e48\uff1f<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p>\u5229\u7528git\u7248\u672c\u63a7\u5236\u5de5\u5177\u65f6\uff0c\u6211\u4eec\u901a\u5e38\u4f1a\u4ece\u4e3b\u5206\u652f\u62c9\u51fa\u65b0\u5206\u652f\u8fdb\u884c\u5f00\u53d1\uff0c\u5f00\u53d1\u5b8c\u6210\u540e\u521b\u5efapr\uff08\u4e5f\u5c31\u662fpull request\uff09\uff0c\u8ba9\u5176\u4ed6\u5c0f\u4f19\u4f34\u5e2e\u5fd9review\uff0c\u786e\u5b9a\u4ee3\u7801\u6ca1\u6709\u95ee\u9898\u540e\u518d\u5c06\u65b0\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e0a\u3002\u4f46\u662f\uff0c\u4f60\u771f\u7684\u7406\u89e3pull request\u4e2d\u6bd4\u8f83\u7684\u4e24\u4e2a\u5206\u652f\u5230\u5e95\u662f\u8c01\u5417\uff1f<\/p>\n\n\n\n<p>\u4e0b\u9762\u4ee5\u4e00\u4e2a\u865a\u62df\u6848\u4f8b\u8fdb\u884c\u8bf4\u660e\uff1a\u5047\u8bbe\u4e3b\u5206\u652f\u540d\u4e3a\u201cMaster\u201d\uff0c\u62c9\u51fa\u6765\u7684\u65b0\u5206\u652f\u540d\u4e3a\u201cdevelopBrance1\u201d\u3002<\/p>\n\n\n\n<p>\u6ce8\uff1a\u56fe\u4e2d\u7684\u7bad\u5934\u6307\u4ee3\u5de5\u4f5c\u63a8\u8fdb\u65b9\u5411\uff0c\u800c\u4e0d\u662f\u63d0\u4ea4\u7684\u6307\u5411\uff08\u63d0\u4ea4\u6307\u5411\u603b\u662f\u7531\u5f53\u524d\u63d0\u4ea4\u6307\u5411\u7236\u63d0\u4ea4\uff0c\u548c\u8fd9\u91cc\u7684\u7bad\u5934\u662f\u53cd\u7740\u7684\uff09<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"460\" src=\"https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-65-1024x460.png\" alt=\"\" class=\"wp-image-17111\" style=\"width:492px;height:auto\" srcset=\"https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-65-1024x460.png 1024w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-65-300x135.png 300w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-65-768x345.png 768w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-65-1536x690.png 1536w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-65-830x373.png 830w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-65-230x103.png 230w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-65-350x157.png 350w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-65-480x216.png 480w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-65.png 1918w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure><\/div>\n\n\n<p>\u4e0a\u56fe\u4e2d\uff0c\u6211\u4eec\u4ece\u4e3b\u5206\u652fMaster\u7684m1\u63d0\u4ea4\u70b9\u62c9\u51fa\u65b0\u5206\u652fdevelopBranch1\uff0c\u7136\u540e\u5728developBranch1\u5206\u652f\u4e0a\u5f00\u53d1\uff08\u5f00\u53d1\u8fc7\u7a0b\u4e2d\u4ea7\u751f\u4e86d1\u3001d2\u3001d3\u51713\u4e2a\u63d0\u4ea4\uff09\uff0c\u5f00\u53d1\u5b8c\u6210\u540e\u521b\u5efapr\uff0c\u7136\u540e\u7ecf\u8fc7Review\u540e\u5c06\u5176\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e0a\u5f62\u6210\u65b0\u7684\u63d0\u4ea4\u70b9N\u3002\u81ea\u7136\u800c\u7136\u5730\uff0c\u6211\u4eec\u521b\u5efapr\u65f6\u9009\u62e9\u7684\u6e90\u548c\u76ee\u6807\u4e3a\uff1a<\/p>\n\n\n\n<p>src[<strong>developBranch1<\/strong>] -&gt; dest[<strong>Master<\/strong>]<\/p>\n\n\n\n<p>\u6211\u4eec\u671f\u671bpr\u6bd4\u8f83\u7684\u662fdevelopBranch1\u548cMaster\u8fd9\u4e24\u4e2a\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\u70b9\uff0cpr\u5b9e\u9645\u6bd4\u8f83\u7684\u4e5f\u662fdevelopBranch1\u7684d3\u63d0\u4ea4\u70b9\u548cMaster\u5206\u652f\u7684m1\u63d0\u4ea4\u70b9\u4e4b\u95f4\u7684\u5dee\u5f02\u3002<\/p>\n\n\n\n<p>d3 \u5e76\u4e0d\u5305\u542b d1 \u548c d2 \u7684\u5b9e\u9645\u5185\u5bb9 \uff0c\u4f46\u5728\u6bd4\u8f83\u5dee\u5f02\u65f6\uff0cd1 \u548c d2 \u7684\u5f71\u54cd\u662f\u5b58\u5728\u7684 \u3002\u4ee5\u4e0b\u662f\u5177\u4f53\u8bf4\u660e\uff1a<\/p>\n\n\n\n<p>\u5728\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff08\u5982 Git \uff09\u4e2d\uff0c\u6bcf\u4e2a\u63d0\u4ea4\uff08commit \uff09\u90fd\u662f\u4e00\u4e2a\u72ec\u7acb\u7684\u5feb\u7167\uff0c\u8bb0\u5f55\u4e86\u5f53\u65f6\u4ee3\u7801\u4ed3\u5e93\u7684\u72b6\u6001 \u3002d1\u3001d2\u3001d3 \u90fd\u662f\u5728 developBranch1 \u5206\u652f\u4e0a\u4e0d\u540c\u65f6\u95f4\u70b9\u7684\u72ec\u7acb\u63d0\u4ea4\u3002d3 \u662f\u8be5\u5206\u652f\u4e0a\u6700\u65b0\u7684\u72b6\u6001\uff0c\u5b83\u57fa\u4e8e d2 \u63d0\u4ea4\u800c\u6765\uff0cd2 \u53c8\u57fa\u4e8e d1 \u63d0\u4ea4\u800c\u6765\uff0c\u4f46\u5b83\u4eec\u5728\u5b58\u50a8\u4e0a\u662f\u5404\u81ea\u72ec\u7acb\u7684\u8bb0\u5f55 \u3002<\/p>\n\n\n\n<p>\u5f53\u521b\u5efa\u62c9\u53d6\u8bf7\u6c42\uff08pr \uff09\u6bd4\u8f83 developBranch1 \u5206\u652f\uff08d3 \u63d0\u4ea4\u70b9 \uff09\u548c Master \u5206\u652f\uff08m1 \u63d0\u4ea4\u70b9 \uff09\u5dee\u5f02\u65f6\uff1a<\/p>\n\n\n\n<ul>\n<li>\u7cfb\u7edf\u4f1a\u4ece d3 \u5f00\u59cb\uff0c\u6cbf\u7740\u63d0\u4ea4\u5386\u53f2\u56de\u6eaf\uff0c\u5206\u6790\u4ece m1 \u4e4b\u540e\u5728 developBranch1 \u5206\u652f\u4e0a\u6240\u6709\u63d0\u4ea4\u5e26\u6765\u7684\u53d8\u5316\u3002\u867d\u7136\u76f4\u63a5\u6bd4\u8f83\u7684\u662f d3 \u548c m1 \uff0c\u4f46\u5b9e\u9645\u4e0a\u4f1a\u8003\u8651\u4ece m1 diverge\uff08\u5206\u53c9 \uff09\u4e4b\u540e\u5728 developBranch1 \u5206\u652f\u4e0a\u7684\u6240\u6709\u63d0\u4ea4\uff08\u5373 d1\u3001d2\u3001d3 \u5e26\u6765\u7684\u7d2f\u8ba1\u53d8\u66f4 \uff09\u3002<\/li>\n\n\n\n<li>\u4f8b\u5982\uff0cd1 \u53ef\u80fd\u4fee\u6539\u4e86\u67d0\u4e2a\u51fd\u6570\u7684\u53c2\u6570\uff0cd2 \u589e\u52a0\u4e86\u51fd\u6570\u7684\u529f\u80fd\u903b\u8f91\uff0cd3 \u4fee\u590d\u4e86 d2 \u5f15\u5165\u7684\u4e00\u4e2a\u5c0f bug \u3002\u5728\u6bd4\u8f83 d3 \u548c m1 \u65f6\uff0c\u8fd9\u4e9b\u4ece d1 \u5f00\u59cb\u9010\u6b65\u5f15\u5165\u7684\u53d8\u66f4\u90fd\u4f1a\u88ab\u7eb3\u5165\u5dee\u5f02\u5206\u6790\u8303\u56f4\uff0c\u6700\u7ec8\u5448\u73b0\u51fa\u4ece m1 \u72b6\u6001\u5230 d3 \u72b6\u6001\u6574\u4e2a\u5206\u652f\u4e0a\u7684\u4ee3\u7801\u53d8\u5316\u60c5\u51b5\uff0c\u4ee5\u4fbf\u5ba1\u67e5\u8005\u4e86\u89e3\u8be5\u5206\u652f\u76f8\u5bf9\u4e3b\u5206\u652f\u505a\u4e86\u54ea\u4e9b\u4fee\u6539\u3002<\/li>\n<\/ul>\n\n\n\n<p><strong>\u8981\u662f cherry pick d3\uff0c\u662f\u4e0d\u662f\u5c31\u4e0d\u770bd1\u548cd2\u4e86\uff1f<\/strong><\/p>\n\n\n\n<p>\u662f\u7684\uff0c\u8fd9\u548c cherry pick \u4e0d\u540c \u3002Git \u7684 cherry pick \u662f\u5c06\u6307\u5b9a\u7684\u63d0\u4ea4\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\u7684\u64cd\u4f5c \u3002\u5982\u679c cherry pick d3 \uff0c\u786e\u5b9e\u5c31\u53ea\u5173\u6ce8 d3 \u8fd9\u4e2a\u63d0\u4ea4\u672c\u8eab\u7684\u5185\u5bb9\uff0c\u4e0d\u770b d1 \u548c d2 \u3002<\/p>\n\n\n\n<ul>\n<li><strong>cherry pick \u539f\u7406<\/strong>\uff1a\u5b83\u4f1a\u628a\u6307\u5b9a\u63d0\u4ea4\uff08\u8fd9\u91cc\u662f d3 \uff09\u6240\u505a\u7684\u6587\u4ef6\u4fee\u6539\u3001\u4ee3\u7801\u53d8\u52a8\u7b49\uff0c\u5728\u76ee\u6807\u5206\u652f\u4e0a\u91cd\u65b0\u5e94\u7528\u4e00\u904d\uff0c\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\uff08\u65b0\u63d0\u4ea4\u5185\u5bb9\u548c d3 \u76f8\u540c\uff0c\u4f46\u63d0\u4ea4\u54c8\u5e0c\u503c\u4e0d\u540c \uff09 \u3002\u6bd4\u5982 d3 \u63d0\u4ea4\u662f\u4fee\u6539\u4e86 file3 \u6587\u4ef6\u4e2d\u7684\u67d0\u4e2a\u51fd\u6570\u903b\u8f91\uff0ccherry pick d3 \u5230\u5176\u4ed6\u5206\u652f\u65f6\uff0c\u5c31\u4f1a\u5728\u76ee\u6807\u5206\u652f\u4e0a\u5bf9 file3 \u6587\u4ef6\u505a\u76f8\u540c\u7684\u51fd\u6570\u903b\u8f91\u4fee\u6539 \u3002<\/li>\n\n\n\n<li><strong>\u4e0e\u62c9\u53d6\u8bf7\u6c42\u5dee\u5f02\u5bf9\u6bd4<\/strong>\uff1a\u62c9\u53d6\u8bf7\u6c42\uff08pr \uff09\u6bd4\u8f83 d3 \u548c m1 \u65f6\uff0c\u4f1a\u8003\u8651 developBranch1 \u5206\u652f\u4ece m1 \u5206\u53c9\u540e\u6240\u6709\u63d0\u4ea4\uff08d1\u3001d2\u3001d3 \uff09\u5e26\u6765\u7684\u7d2f\u8ba1\u53d8\u5316\uff1b\u800c cherry pick d3 \u53ea\u5173\u6ce8 d3 \u8fd9\u4e00\u6b21\u63d0\u4ea4\u7684\u5185\u5bb9\uff0c\u5c06\u5176\u5355\u72ec\u590d\u5236\u5230\u76ee\u6807\u5206\u652f\uff0c\u4e0d\u6d89\u53ca d1 \u548c d2 \u7684\u76f8\u5173\u903b\u8f91 \u3002<\/li>\n<\/ul>\n\n\n\n<p><strong>\u4ec0\u4e48\u662f Merge Request<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p>MR \u7684\u5168\u79f0\u662f Merge Request\uff0c\u76f8\u4fe1\u73a9\u8fc7 Gitlab\u7684\u540c\u5b66\u90fd\u77e5\u9053\u8fd9\u4e2a\u3002<\/p>\n\n\n\n<p>\u63d2\u64ad\u4e00\u4e0b\uff0cGithub\u8fd9\u4e48\u597d\u7528\u4e86\u4e3a\u4ec0\u4e48\u8fd8\u6709\u4eba\u73a9 Gitlab\uff0c\u8fd9\u5c31\u8981\u51e0\u5e74\u524d\u8bf4\u8d77\u4e86\u3002\u5728\u5fae\u8f6f\u6ca1\u6709\u6536\u8d2d Github \u4e4b\u524d\uff0cGithub \u4e0a\u9762\u6240\u6709\u7684\u9879\u76ee\u5fc5\u987b\u662f\u516c\u5f00\u7684\uff0c\u4e5f\u5c31\u662f\u8bf4\u81ea\u5df1\u5f88\u6e23\u7684\u4ee3\u7801\u4e5f\u5fc5\u987b\u8981\u516c\u5f00\uff0c\u4e0d\u80fd\u85cf\u7740\u564e\u7740\u3002\u4f46\u662f\u5728\u4e00\u4e9b\u5c0f\u7684\u516c\u53f8\u6216\u8005\u521b\u4e1a\u56e2\u961f\uff0c\u4ee3\u7801\u8fd9\u79cd\u6838\u5fc3\u8d44\u4ea7\u662f\u4e0d\u5e0c\u671b\u88ab\u516c\u5f00\uff0c\u4ed6\u4eec\u8feb\u5207\u9700\u8981\u79c1\u5bc6\u4ed3\u8fd9\u79cd\u9700\u6c42\uff0c\u6240\u4ee5\u5f88\u591a\u4eba\u90fd\u9009\u62e9\u4e86 Gitlab\u3002\u5f53\u7136\u540e\u9762 Github \u4e5f\u653e\u5f00\u4e86\u79c1\u6709\u4ed3\u5e93\uff0c\u8fd9\u662f\u540e\u8bdd\u4e86\u3002<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"775\" src=\"https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-67-1024x775.png\" alt=\"\" class=\"wp-image-17113\" style=\"width:496px;height:auto\" srcset=\"https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-67-1024x775.png 1024w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-67-300x227.png 300w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-67-768x581.png 768w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-67-830x628.png 830w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-67-230x174.png 230w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-67-350x265.png 350w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-67-480x363.png 480w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-67.png 1372w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure><\/div>\n\n\n<p>\u56e2\u961f\u4e2d\u6bcf\u4e2a\u4eba\u90fd\u4ece\u8fdc\u7a0b\u4ed3\u5e93 develop \u5206\u652f\u62c9\u53d6\u4ee3\u7801\uff0c\u672c\u5730\u57fa\u4e8e develop \u5206\u652f\u65b0\u5efa\u7279\u6027\u5206\u652f\uff0c\u4fee\u6539\u5b8c\u4ee3\u7801\u5c06\u7279\u6027\u5206\u652f\u63a8\u5230\u8fdc\u7a0b\u4ed3\uff0c\u7d27\u63a5\u7740\u65b0\u5efa Merge Request \u671f\u671b\u5c06\u81ea\u5df1\u7684\u7279\u6027\u5206\u652f\u5408\u5165 develop \u5206\u652f\u3002<\/p>\n\n\n\n<p>\u4ece\u4e0a\u9762\u8fd9\u4e2a\u6d41\u7a0b\u6765\u770bMerge Request \u5c31\u662f\u5c06\u81ea\u5df1\u7684\u7279\u6027\u5206\u652f\u5408\u5165\u5230\u4e3b\u5e72\u5206\u652f\u3002<\/p>\n\n\n\n<p><strong>Pull Request VS Merge Request<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p>\u603b\u7ed3\u4e00\u4e0b\u4e0a\u9762\u4e24\u4e2a\u4f8b\u5b50\u3002<\/p>\n\n\n\n<p>Github \u662f\u73a9 fork<a href=\"https:\/\/zhida.zhihu.com\/search?content_id=165445252&amp;content_type=Article&amp;match_order=1&amp;q=fork+%E6%A8%A1%E5%BC%8F&amp;zd_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ6aGlkYV9zZXJ2ZXIiLCJleHAiOjE3NDQxNzQ0MzIsInEiOiJmb3JrIOaooeW8jyIsInpoaWRhX3NvdXJjZSI6ImVudGl0eSIsImNvbnRlbnRfaWQiOjE2NTQ0NTI1MiwiY29udGVudF90eXBlIjoiQXJ0aWNsZSIsIm1hdGNoX29yZGVyIjoxLCJ6ZF90b2tlbiI6bnVsbH0.JJQSoZAD0kH21JfTMQ_t7FktUCd3uBR8BvXXtGNts18&amp;zhida_source=entity\" target=\"_blank\" rel=\"noreferrer noopener\"> <\/a>\u6a21\u5f0f\u7684\uff0c\u5f00\u53d1\u8005\u63d0\u4ea4\u81ea\u5df1\u7684\u4ee3\u7801\u65b0\u5efa Pull Request\uff0c\u8bf7\u6c42\u539f\u4f5c\u8005\uff1a\u201c\u628a\u6211\u7684\u4ee3\u7801\u62c9\u56de\u53bb\u5427\u201d\u3002<\/p>\n\n\n\n<p>Gitlab \u662f\u73a9\u5206\u652f\u6a21\u5f0f\u7684\uff0c\u5f00\u53d1\u8005\u63d0\u4ea4\u81ea\u5df1\u7684\u4ee3\u7801\u65b0\u5efa Merge Request\uff0c\u60f3\u5c06\u81ea\u5df1\u7684\u7279\u6027\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5e72\u3002<\/p>\n\n\n\n<p>\u4e0a\u9762\u603b\u7ed3\u7684\u597d\u50cf\u5f88\u6709\u9053\u7406\uff0c\u4f46\u662f\u4e0d\u8981\u5fd8\u4e86\uff0cGithub \u4e5f\u53ef\u4ee5\u73a9\u5206\u652f\u6a21\u5f0f\uff0cGitlab \u4e5f\u53ef\u4ee5\u73a9 fork \u6a21\u5f0f\uff0c\u66f4\u4ee4\u4eba\u65e0\u8bed\u7684\u662f\uff1a<\/p>\n\n\n\n<p>Github \u4e0a\u5408\u5e76\u5206\u652f\u8fd8\u662f\u53eb Pull Request\uff1bGitlab \u4e0afork \u6a21\u5f0f\u4e5f\u662f\u53eb Merge Request\uff1b<\/p>\n\n\n\n<p>\u4e0d\u884c\uff0c\u8fd9\u79cd\u7b54\u6848\u6211\u6ca1\u6cd5\u63a5\u53d7\uff0c\u53bb stackoverflow\u4e0a\u641c\u4e00\u4e9b\u5927\u5bb6\u662f\u600e\u4e48\u7406\u89e3\u7684\u3002\u679c\u7136\u6709\u4e00\u4e2a\u5e16\u5b50\u5f88\u706b\uff1a<\/p>\n\n\n\n<p>\u6709\u4e00\u4e2a\u56de\u7b54\u6458\u53d6\u4e86 Gitlab \u7684\u5b98\u65b9\u89e3\u91ca\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-preformatted\">    Merge or pull requests are created in a git management application and ask an assigned person to merge two branches. Tools such as GitHub and Bitbucket choose the name pull request since the first manual action would be to pull the feature branch. Tools such as GitLab and Gitorious choose the name merge request since that is the final action that is requested of the assignee. In this article we'll refer to them as merge requests.<\/pre>\n\n\n\n<p>\u7ffb\u8bd1\u8fc7\u6765\u7b80\u5355\u7406\u89e3\u5c31\u662f\uff1a\u8fd9\u4e24\u4e2a\u6ca1\u6709\u672c\u8d28\u533a\u522b\uff0c\u7ad9\u5728\u4e0d\u540c\u7acb\u573a\u8bf4\u6cd5\u4e0d\u4e00\u6837\u800c\u5df2\u3002<\/p>\n\n\n\n<p>\u597d\u4e86\uff0c\u5b98\u65b9\u5df2\u7ecf\u76d6\u68fa\u5b9a\u8bba\u4e86\uff0c\u8fd9\u4e24\u4e2a\u5c31\u662f\u4e00\u4e2a\u4e1c\u897f\uff0c\u4e0d\u8981\u7ea0\u7ed3\u5566~<\/p>\n\n\n\n<p>\u75af\u72c2\u5410\u69fd\uff1a\u5bf9\u4e8e\u521d\u5b66\u8005\u6765\u8bf4\uff0cGithub \u7684 pull request \u786e\u5b9e\u8ba9\u4eba\u96be\u4ee5\u7406\u89e3\uff0c\u6211\u4eec\u53bb\u5404\u5927\u7f51\u7ad9\u770b\u770b\u7528\u6237\u7684\u58f0\u97f3\u3002<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"591\" src=\"https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-69-1024x591.png\" alt=\"\" class=\"wp-image-17115\" style=\"width:552px;height:auto\" srcset=\"https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-69-1024x591.png 1024w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-69-300x173.png 300w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-69-768x443.png 768w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-69-830x479.png 830w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-69-230x133.png 230w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-69-350x202.png 350w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-69-480x277.png 480w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-69.png 1448w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure><\/div>\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"766\" src=\"https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-71-1024x766.png\" alt=\"\" class=\"wp-image-17117\" style=\"width:492px;height:auto\" srcset=\"https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-71-1024x766.png 1024w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-71-300x224.png 300w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-71-768x574.png 768w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-71-830x621.png 830w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-71-230x172.png 230w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-71-350x262.png 350w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-71-480x359.png 480w, https:\/\/92it.top\/wp-content\/uploads\/2025\/04\/\u56fe\u7247-71.png 1412w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure><\/div>\n\n\n<p>\u4ece\u56fd\u5916\u5230\u56fd\u5185\u90fd\u6709\u5927\u91cf\u7684\u7528\u6237\u5bf9\u8fd9\u4e2a\u540d\u5b57\u4e0d\u7406\u89e3\uff0c\u660e\u660e\u662f\u63d0\u4ea4\u63d0\u4ea4\u4ee3\u7801\uff0c\u4e3a\u4ec0\u4e48\u662f pull request\uff0c\u6709\u4e9b\u4eba\u751a\u81f3\u6000\u7591\u662f\u540d\u5b57\u6253\u9519\u4e86\u3002<\/p>\n\n\n\n<p>\u5982\u679c\u8ba9\u6211\u6765\u7ed9 Github \u53d6\u540d\u5b57\uff0c\u6211\u53ef\u80fd\u4f1a\u53d6\uff1a<\/p>\n\n\n\n<ul>\n<li>push request \u63a8\u8bf7\u6c42<\/li>\n\n\n\n<li>merge request \u5408\u5e76\u8bf7\u6c42<\/li>\n<\/ul>\n\n\n\n<p>\u60f3\u591a\u4e86\uff0c\u4e0d\u4f1a\u6709\u5982\u679c\u3002[\u563f\u54c8] Pull Request \u548cMerge Request \u672c\u8d28\u4e0a\u90fd\u662f\u5408\u5165\u4ee3\u7801\uff0c\u53ea\u662f\u7ad9\u5728\u4e0d\u540c\u89d2\u5ea6\u6709\u4e0d\u540c\u7684\u8bf4\u6cd5\u800c\u5df2\uff0c\u56e0\u6b64\u5728\u5b66\u4e60\u548c\u5de5\u4f5c\u4e2d\u65e0\u8bba\u7528\u54ea\u4e00\u4e2a\u90fd\u6ca1\u6709\u95ee\u9898\u3002<\/p>\n\n\n\n<p><strong><code>git merge<\/code>\u00a0\u8fdb\u884c\u5408\u5e76<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p>\u5728\u4f7f\u7528&nbsp;<code>git merge<\/code>&nbsp;\u8fdb\u884c\u5408\u5e76\u65f6\uff0cGit \u4f1a\u81ea\u52a8\u5b8c\u6210\u6bd4\u8f83\u548c\u5408\u5e76\u7684\u64cd\u4f5c\uff0c\u4e0b\u9762\u4e3a\u4f60\u8be6\u7ec6\u4ecb\u7ecd\u5177\u4f53\u7684\u6d41\u7a0b\u548c\u53ef\u80fd\u51fa\u73b0\u7684\u60c5\u51b5\u3002<\/p>\n\n\n\n<p><strong>\u81ea\u52a8\u6bd4\u8f83\u548c\u5408\u5e76\u7684\u6d41\u7a0b<\/strong><\/p>\n\n\n\n<ol>\n<li><strong>\u786e\u5b9a\u5408\u5e76\u7684\u63d0\u4ea4<\/strong>\uff1a\u4f60\u9700\u8981\u6307\u5b9a\u4e00\u4e2a\u76ee\u6807\u5206\u652f\u548c\u4e00\u4e2a\u6e90\u5206\u652f\uff0cGit \u4f1a\u5c06\u6e90\u5206\u652f\u4e0a\u7684\u63d0\u4ea4\u5408\u5e76\u5230\u76ee\u6807\u5206\u652f\u4e0a\u3002\u4f8b\u5982\uff0c\u4f60\u5f53\u524d\u5904\u4e8e\u00a0<code>master<\/code>\u00a0\u5206\u652f\uff0c\u60f3\u8981\u5408\u5e76\u00a0<code>feature<\/code>\u00a0\u5206\u652f\u7684\u66f4\u6539\uff0c\u4f60\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\">git checkout master\ngit merge feature<\/pre>\n\n\n\n<ol start=\"2\">\n<li><strong>\u5bfb\u627e\u5171\u540c\u7956\u5148<\/strong>\uff1aGit \u4f1a\u5728\u63d0\u4ea4\u5386\u53f2\u4e2d\u5bfb\u627e\u4e24\u4e2a\u5206\u652f\u7684\u5171\u540c\u7956\u5148\uff08\u5373\u4e24\u4e2a\u5206\u652f\u5f00\u59cb\u5206\u53c9\u7684\u63d0\u4ea4\u70b9\uff09\u3002\u5047\u8bbe\u00a0<code>master<\/code>\u00a0\u5206\u652f\u7684\u63d0\u4ea4\u5386\u53f2\u4e3a A -> B -> C\uff0c<code>feature<\/code>\u00a0\u5206\u652f\u7684\u63d0\u4ea4\u5386\u53f2\u4e3a A -> D -> E\uff0c\u90a3\u4e48\u5171\u540c\u7956\u5148\u5c31\u662f\u63d0\u4ea4 A\u3002<\/li>\n\n\n\n<li><strong>\u6bd4\u8f83\u5dee\u5f02<\/strong>\uff1aGit \u4f1a\u5206\u522b\u6bd4\u8f83\u5171\u540c\u7956\u5148\u4e0e\u76ee\u6807\u5206\u652f\uff08\u5982\u00a0<code>master<\/code>\uff09\u4ee5\u53ca\u5171\u540c\u7956\u5148\u4e0e\u6e90\u5206\u652f\uff08\u5982\u00a0<code>feature<\/code>\uff09\u7684\u5dee\u5f02\u3002\u4f8b\u5982\uff0c\u5b83\u4f1a\u627e\u51fa\u4ece A \u5230 C \u4ee5\u53ca\u4ece A \u5230 E \u4e4b\u95f4\u6587\u4ef6\u7684\u4fee\u6539\u3001\u65b0\u589e\u548c\u5220\u9664\u60c5\u51b5\u3002<\/li>\n\n\n\n<li><strong>\u81ea\u52a8\u5408\u5e76<\/strong>\uff1a\u5982\u679c\u4e24\u4e2a\u5206\u652f\u7684\u66f4\u6539\u6ca1\u6709\u51b2\u7a81\uff0cGit \u4f1a\u5c1d\u8bd5\u81ea\u52a8\u5408\u5e76\u8fd9\u4e9b\u66f4\u6539\u3002\u5b83\u4f1a\u5c06\u6e90\u5206\u652f\u4e0a\u7684\u66f4\u6539\u5e94\u7528\u5230\u76ee\u6807\u5206\u652f\u4e0a\uff0c\u751f\u6210\u4e00\u4e2a\u65b0\u7684\u5408\u5e76\u63d0\u4ea4\u3002\u4f8b\u5982\uff0c\u5c06\u00a0<code>feature<\/code>\u00a0\u5206\u652f\u4e0a\u4ece A \u5230 E \u7684\u66f4\u6539\u5e94\u7528\u5230\u00a0<code>master<\/code>\u00a0\u5206\u652f\u7684 C \u63d0\u4ea4\u4e4b\u540e\u3002<\/li>\n<\/ol>\n\n\n\n<p><strong>\u51b2\u7a81\u5904\u7406<\/strong><\/p>\n\n\n\n<p>\u5982\u679c\u5728\u6bd4\u8f83\u8fc7\u7a0b\u4e2d\u53d1\u73b0\u4e24\u4e2a\u5206\u652f\u5bf9\u540c\u4e00\u6587\u4ef6\u7684\u540c\u4e00\u90e8\u5206\u8fdb\u884c\u4e86\u4e0d\u540c\u7684\u4fee\u6539\uff0c\u5c31\u4f1a\u53d1\u751f\u51b2\u7a81\u3002\u6b64\u65f6\uff0cGit \u65e0\u6cd5\u81ea\u52a8\u5408\u5e76\uff0c\u9700\u8981\u4f60\u624b\u52a8\u89e3\u51b3\u51b2\u7a81\u3002<\/p>\n\n\n\n<ol>\n<li><strong>\u67e5\u770b\u51b2\u7a81\u6587\u4ef6<\/strong>\uff1aGit \u4f1a\u6807\u8bb0\u51fa\u53d1\u751f\u51b2\u7a81\u7684\u6587\u4ef6\uff0c\u4f60\u53ef\u4ee5\u4f7f\u7528\u00a0<code>git status<\/code>\u00a0\u547d\u4ee4\u67e5\u770b\u8fd9\u4e9b\u6587\u4ef6\u3002<\/li>\n\n\n\n<li><strong>\u7f16\u8f91\u51b2\u7a81\u6587\u4ef6<\/strong>\uff1a\u6253\u5f00\u51b2\u7a81\u6587\u4ef6\uff0c\u4f60\u4f1a\u770b\u5230\u7c7b\u4f3c\u4e0b\u9762\u7684\u6807\u8bb0\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\">&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\n\u8fd9\u662f\u76ee\u6807\u5206\u652f\uff08\u5982 master\uff09\u7684\u5185\u5bb9\n=======\n\u8fd9\u662f\u6e90\u5206\u652f\uff08\u5982 feature\uff09\u7684\u5185\u5bb9\n>>>>>>> feature<\/pre>\n\n\n\n<p>\u4f60\u9700\u8981\u624b\u52a8\u51b3\u5b9a\u4fdd\u7559\u54ea\u4e00\u90e8\u5206\u5185\u5bb9\uff0c\u6216\u8005\u5c06\u4e24\u90e8\u5206\u5185\u5bb9\u8fdb\u884c\u6574\u5408\u3002\u7f16\u8f91\u5b8c\u6210\u540e\uff0c\u5220\u9664\u51b2\u7a81\u6807\u8bb0\u3002<\/p>\n\n\n\n<p>\u5728<code>git merge<\/code>\u65f6\u6bd4\u8f83\u5dee\u5f02\uff0c\u5e76\u975e\u7b80\u5355\u7684\u5168\u6587\u4ef6\u6bd4\u8f83\uff0c\u800c\u662f\u4f1a\u91c7\u7528\u667a\u80fd\u7b97\u6cd5\u5bf9\u6587\u4ef6\u8fdb\u884c\u7ec6\u81f4\u6bd4\u5bf9\uff0c\u5373\u4f7f\u5dee\u5f02\u7684\u884c\u53f7\u4e0d\u540c\u4e5f\u80fd\u7cbe\u51c6\u8bc6\u522b\uff1a<\/p>\n\n\n\n<p><strong>\u6bd4\u8f83\u673a\u5236<\/strong><\/p>\n\n\n\n<ul>\n<li><strong>\u884c\u7ea7\u6bd4\u8f83<\/strong>\uff1aGit \u4ee5\u884c\u4e3a\u5355\u4f4d\u5bf9\u6587\u4ef6\u8fdb\u884c\u6bd4\u8f83\uff0c\u9010\u884c\u68c0\u67e5\u4e24\u4e2a\u7248\u672c\u6587\u4ef6\u7684\u5185\u5bb9\u3002\u5b83\u4f1a\u5c1d\u8bd5\u627e\u51fa\u6587\u4ef6\u4e2d\u53d1\u751f\u53d8\u5316\u7684\u6700\u5c0f\u5355\u5143\uff0c\u4e5f\u5c31\u662f\u5177\u4f53\u7684\u884c\u3002\u5bf9\u4e8e\u6587\u672c\u6587\u4ef6\uff0c\u5373\u4f7f\u884c\u53f7\u4e0d\u540c\uff0c\u53ea\u8981\u67d0\u4e00\u884c\u7684\u5185\u5bb9\u53d1\u751f\u4e86\u6539\u53d8\uff0cGit \u5c31\u80fd\u8bc6\u522b\u51fa\u6765\u3002\u4f8b\u5982\uff0c\u5728\u4e00\u4e2a\u4ee3\u7801\u6587\u4ef6\u4e2d\uff0c\u539f\u672c\u4f4d\u4e8e\u7b2c 10 \u884c\u7684\u4ee3\u7801\u88ab\u79fb\u52a8\u5230\u4e86\u7b2c 20 \u884c\uff0c\u540c\u65f6\u5185\u5bb9\u4e5f\u6709\u4fee\u6539\uff0cGit \u4f1a\u68c0\u6d4b\u5230\u8fd9\u4e00\u884c\u7684\u53d8\u5316\uff0c\u5e76\u51c6\u786e\u8bb0\u5f55\u3002<\/li>\n\n\n\n<li><strong>\u5185\u5bb9\u611f\u77e5<\/strong>\uff1aGit \u4f1a\u8003\u8651\u884c\u7684\u5185\u5bb9\u800c\u4e0d\u4ec5\u4ec5\u662f\u884c\u53f7\u3002\u5b83\u4f7f\u7528\u4e86\u4e00\u79cd\u53eb\u505a \u201c\u6700\u957f\u516c\u5171\u5b50\u5e8f\u5217\u201d\uff08LCS\uff09\u7684\u7b97\u6cd5\uff0c\u8be5\u7b97\u6cd5\u80fd\u591f\u627e\u51fa\u4e24\u4e2a\u6587\u4ef6\u4e2d\u76f8\u540c\u5185\u5bb9\u7684\u6700\u5927\u8fde\u7eed\u884c\u5e8f\u5217\u3002\u901a\u8fc7\u8fd9\u79cd\u65b9\u5f0f\uff0cGit \u53ef\u4ee5\u786e\u5b9a\u54ea\u4e9b\u884c\u662f\u65b0\u589e\u7684\u3001\u54ea\u4e9b\u884c\u662f\u5220\u9664\u7684\u4ee5\u53ca\u54ea\u4e9b\u884c\u53ea\u662f\u4f4d\u7f6e\u53d1\u751f\u4e86\u53d8\u5316\u3002\u6bd4\u5982\uff0c\u4e00\u4e2a\u51fd\u6570\u5728\u4ee3\u7801\u6587\u4ef6\u4e2d\u7684\u4f4d\u7f6e\u88ab\u79fb\u52a8\u4e86\uff0c\u4f46\u51fd\u6570\u5185\u90e8\u7684\u4ee3\u7801\u57fa\u672c\u4fdd\u6301\u4e0d\u53d8\uff0cGit \u4f1a\u8bc6\u522b\u51fa\u8fd9\u662f\u4e00\u4e2a\u4f4d\u7f6e\u53d8\u52a8\uff0c\u800c\u4e0d\u662f\u5168\u65b0\u7684\u4ee3\u7801\u3002<\/li>\n\n\n\n<li><strong>\u6587\u4ef6\u72b6\u6001\u5224\u65ad<\/strong>\uff1a\u9664\u4e86\u884c\u7ea7\u7684\u6bd4\u8f83\uff0cGit \u8fd8\u4f1a\u5224\u65ad\u6587\u4ef6\u7684\u6574\u4f53\u72b6\u6001\uff0c\u5982\u6587\u4ef6\u662f\u5426\u88ab\u65b0\u589e\u3001\u5220\u9664\u3001\u91cd\u547d\u540d\u6216\u6743\u9650\u53d1\u751f\u4e86\u6539\u53d8\u3002\u5982\u679c\u4e00\u4e2a\u6587\u4ef6\u5728\u4e00\u4e2a\u63d0\u4ea4\u4e2d\u88ab\u5220\u9664\uff0c\u800c\u5728\u53e6\u4e00\u4e2a\u63d0\u4ea4\u4e2d\u88ab\u4fee\u6539\uff0cGit \u4f1a\u5c06\u8fd9\u79cd\u60c5\u51b5\u6807\u8bb0\u4e3a\u51b2\u7a81\uff0c\u9700\u8981\u7528\u6237\u624b\u52a8\u89e3\u51b3\u3002<\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"<p>274 \u4eba\u8d5e\u540c\u4e86\u8be5\u6587\u7ae0 \u5728\u56e2\u961f\u4e2d\u6211\u627f\u62c5\u4e86Committer \u7684\u8d23\u4efb\uff0c\u4e5f\u5c31\u662f\u5e2e\u540c\u4e8b\u4eec\u68c0\u89c6\u4ee3\u7801\uff08Code Revi [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[10],"tags":[],"_links":{"self":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/17107"}],"collection":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=17107"}],"version-history":[{"count":2,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/17107\/revisions"}],"predecessor-version":[{"id":17119,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/17107\/revisions\/17119"}],"wp:attachment":[{"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=17107"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=17107"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=17107"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}