{"id":9793,"date":"2023-03-09T19:07:31","date_gmt":"2023-03-09T11:07:31","guid":{"rendered":"http:\/\/123.57.164.21\/?p=9793"},"modified":"2023-03-09T19:07:31","modified_gmt":"2023-03-09T11:07:31","slug":"%e5%a6%82%e4%bd%95%e8%a7%a3%e5%86%b3-git-%e4%b8%ad%e7%9a%84%e5%90%88%e5%b9%b6%e5%86%b2%e7%aa%81-%e7%a4%ba%e4%be%8b%e7%9a%84%e5%ae%9e%e7%94%a8%e6%8c%87%e5%8d%97","status":"publish","type":"post","link":"https:\/\/92it.top\/?p=9793","title":{"rendered":"\u5982\u4f55\u89e3\u51b3 Git \u4e2d\u7684\u5408\u5e76\u51b2\u7a81\u2014\u2014\u793a\u4f8b\u7684\u5b9e\u7528\u6307\u5357"},"content":{"rendered":"\n<div class=\"wp-block-image\"><figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/123.57.164.21\/wp-content\/uploads\/2023\/03\/image-128-1024x580.png\" alt=\"\" class=\"wp-image-9794\" width=\"494\" height=\"279\" srcset=\"https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-128-1024x580.png 1024w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-128-300x170.png 300w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-128-768x435.png 768w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-128-830x470.png 830w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-128-230x130.png 230w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-128-350x198.png 350w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-128-480x272.png 480w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-128.png 1268w\" sizes=\"(max-width: 494px) 100vw, 494px\" \/><\/figure><\/div>\n\n\n\n<p><code>Git<\/code> \u662f\u4e00\u4e2a\u5f00\u6e90\u7684\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u3002\u5b83\u5e2e\u52a9\u4f60\u4f7f\u7528\u672c\u5730\u5206\u652f\u3001\u6682\u5b58\u548c\u5de5\u4f5c\u6d41\u7a0b\u8f7b\u677e\u7ba1\u7406\u4f60\u7684\u9879\u76ee\u6587\u4ef6\u3002<\/p>\n\n\n\n<p>\u73b0\u5728\u5f88\u591a\u5f00\u53d1\u8005\u90fd\u5728\u4f7f\u7528 Git\u3002\u800c\u4e14\u4ed6\u4eec\u901a\u5e38\u90fd\u719f\u6089 Git \u7684\u57fa\u672c\u6982\u5ff5\uff0c\u6bd4\u5982:<\/p>\n\n\n\n<ul><li>\u5982\u4f55\u521d\u59cb\u5316\u4e00\u4e2a\u4ed3\u5e93\u3002<\/li><li>\u5982\u4f55\u521b\u5efa\u5206\u652f\u3002<\/li><li>\u5982\u4f55\u8fdb\u884c\u6682\u5b58\/\u64a4\u9500\u6682\u5b58\u6027\u4fee\u6539\u3002<\/li><li>\u5982\u4f55\u63d0\u4ea4\u66f4\u6539\u3002<\/li><li>\u5982\u4f55\u5c06\u63d0\u4ea4\u5185\u5bb9\u63a8\u9001\u5230\u8fdc\u7a0b\u3002<\/li><\/ul>\n\n\n\n<p>\u7136\u800c\uff0c\u8bb8\u591a\u5f00\u53d1\u4eba\u5458\u5bf9 <code>\u5408\u5e76\uff08merging)<\/code>\u548c <code>\u89e3\u51b3\u5408\u5e76\u51b2\u7a81\uff08resolving merge conflicts)<\/code> \u7b49\u6982\u5ff5\u611f\u5230\u56f0\u60d1\u3002\u5728\u8fd9\u7bc7\u6587\u7ae0\u4e2d\uff0c\u6211\u4eec\u5c06\u5b66\u4e60\u5982\u4f55\u4ee5\u4e00\u79cd\u5b9e\u7528\u7684\u65b9\u5f0f\u89e3\u51b3\u5408\u5e76\u51b2\u7a81\u3002<\/p>\n\n\n\n<p><strong>\u5f00\u53d1\u4eba\u5458\u5bf9\u5408\u5e76\u51b2\u7a81\u6709\u4f55\u770b\u6cd5\uff1f<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator\"\/>\n\n\n\n<p>\u6700\u8fd1\u6211\u5728 Twitter\u3001LinkedIn \u548c YouTube \u4e0a\u8fdb\u884c\u4e86\u4e00\u6b21\u6295\u7968\uff0c\u8be2\u95ee\u5f00\u53d1\u8005\u5bf9\u89e3\u51b3 Git \u4e2d\u7684\u5408\u5e76\u51b2\u7a81\u662f\u5426\u611f\u5230\u6ee1\u610f\u3002\u4f60\u731c\u6211\u53d1\u73b0\u4e86\u4ec0\u4e48\uff1f<\/p>\n\n\n\n<p>70%-80% \u7684\u5f00\u53d1\u8005\u5206\u4eab\u8bf4\uff0c\u4ed6\u4eec\u8ba4\u4e3a\u5728 Git \u4e2d\u89e3\u51b3\u5408\u5e76\u51b2\u7a81\u5f88\u6709\u6311\u6218\u6027\u3002\u6240\u4ee5\u8fd9\u610f\u5473\u7740 &#8220;\u89e3\u51b3\u5408\u5e76\u51b2\u7a81&#8221; \u662f\u4e00\u4e2a\u91cd\u8981\u7684\u8ba8\u8bba\u8bdd\u9898\u3002<\/p>\n\n\n\n<div class=\"wp-block-image\"><figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/123.57.164.21\/wp-content\/uploads\/2023\/03\/image-129-1024x523.png\" alt=\"\" class=\"wp-image-9795\" width=\"497\" height=\"254\" srcset=\"https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-129-1024x523.png 1024w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-129-300x153.png 300w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-129-768x392.png 768w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-129-830x424.png 830w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-129-230x117.png 230w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-129-350x179.png 350w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-129-480x245.png 480w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-129.png 1132w\" sizes=\"(max-width: 497px) 100vw, 497px\" \/><\/figure><\/div>\n\n\n\n<p>\u6295\u7968\u7ed3\u679c &#8211; \u4f60\u5bf9\u89e3\u51b3 Git \u4e2d\u7684\u5408\u5e76\u51b2\u7a81\u611f\u5230\u6ee1\u610f\u5417\uff1f<\/p>\n\n\n\n<p><strong>\u4ec0\u4e48\u662f Git \u5408\u5e76\uff0c\u4ec0\u4e48\u662f\u5408\u5e76\u51b2\u7a81\uff1f<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator\"\/>\n\n\n\n<p><code>Git<\/code> \u662f\u4e00\u4e2a\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u4fdd\u7559\u4e86\u4f60\u6240\u6709\u6587\u4ef6\u7248\u672c\u7684\u5386\u53f2\u3002\u4f60\u53ef\u4ee5\u5728\u4efb\u4f55\u65f6\u5019\u56de\u5230\u4efb\u4f55\u4e00\u4e2a\u7248\u672c\uff0c\u5e76\u68c0\u7d22\u5230\u66f4\u65e9\u7684\u7248\u672c\u3002<\/p>\n\n\n\n<p>\u5047\u8bbe\u4f60\u521b\u5efa\u4e86\u4e00\u4e2a\u53eb <code>abc.txt<\/code> \u7684\u6587\u4ef6\uff0c\u5e76\u5c06\u5176\u63a8\u9001\u5230 Git \u4ed3\u5e93\u3002\u6b64\u65f6\uff0c\u8be5\u6587\u4ef6\u6709\u5176\u5f53\u524d\u7684\u7248\u672c\u4e0e\u4e4b\u76f8\u5173\u3002\u73b0\u5728\uff0c\u5982\u679c\u4f60\u7684\u540c\u4e8b\u4fee\u6539\u4e86\u540c\u4e00\u4e2a\u6587\u4ef6\uff0c\u5e76\u628a\u5b83\u63a8\u56de\u4ed3\u5e93\uff0c\u8be5\u6587\u4ef6\u5c31\u6709\u4e86\u65b0\u7684\u7248\u672c\u3002<\/p>\n\n\n\n<p><code>Git Merge<\/code> \u662f\u4e00\u4e2a\u5141\u8bb8\u4f60\u5c06\u6587\u4ef6\u7684\u5f53\u524d\u5185\u5bb9\u4e0e\u5176\u4ed6\u4ee5\u524d\u7684\u7248\u672c\u4fdd\u6301\u540c\u6b65\u7684\u529f\u80fd\u3002\u8fd9\u4e00\u70b9\u975e\u5e38\u91cd\u8981\uff0c\u56e0\u4e3a\u4efb\u4f55\u4eba\u5728\u4efb\u4f55\u65f6\u95f4\u70b9\u90fd\u5e94\u8be5\u5728\u6587\u4ef6\u7684\u6700\u65b0\u5185\u5bb9\u4e0a\u5de5\u4f5c\uff0c\u800c\u4e0d\u4f1a\u8986\u76d6\u4ee5\u524d\u7248\u672c\u7684\u4efb\u4f55\u53d8\u5316\u3002<\/p>\n\n\n\n<p>Git <code>merge<\/code> \u53ef\u4ee5\u5e2e\u52a9\u4f60\u5728\u5408\u5e76\u6765\u81ea\u5176\u4ed6\u5f00\u53d1\u8005\u7684\u4fee\u6539\uff0c\u5411\u540c\u4e00\u6587\u4ef6\u63a8\u9001\u65b0\u7684\u4fee\u6539\u4e4b\u524d\u3002<\/p>\n\n\n\n<div class=\"wp-block-image\"><figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/123.57.164.21\/wp-content\/uploads\/2023\/03\/image-130-1024x588.png\" alt=\"\" class=\"wp-image-9796\" width=\"594\" height=\"341\" srcset=\"https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-130-1024x588.png 1024w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-130-300x172.png 300w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-130-768x441.png 768w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-130-830x477.png 830w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-130-230x132.png 230w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-130-350x201.png 350w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-130-480x276.png 480w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-130.png 1292w\" sizes=\"(max-width: 594px) 100vw, 594px\" \/><\/figure><\/div>\n\n\n\n<p>\u5728 Git \u5408\u5e76\u7684\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u9700\u8981\u6ce8\u610f\u4e24\u4ef6\u4e8b:<\/p>\n\n\n\n<ol><li><strong>changes\uff08\u53d8\u5316\uff09<\/strong>\uff1a\u4e00\u4e2a\u6587\u4ef6\u7684\u4e24\u4e2a\u7248\u672c\u4e4b\u95f4\u53d1\u751f\u4e86\u4ec0\u4e48\u7c7b\u578b\u7684\u64cd\u4f5c\uff1f\u65b0\u7684\u5185\u5bb9\u88ab\u6dfb\u52a0\u6216\u5220\u9664\uff0c\u6216\u8005\u73b0\u6709\u5185\u5bb9\u88ab\u66f4\u65b0\u3002<\/li><li><strong>Possibilities\uff08\u53ef\u80fd\u6027\uff09<\/strong>: \u6709\u4e24\u79cd\u53ef\u80fd\u6027\u3002\u53d8\u5316\u53d1\u751f\u5728\u6587\u4ef6\u7684 &#8220;\u4e0d\u540c\u533a\u57df\uff08different regions\uff09&#8221;\uff0c\u6216\u8005\u53d8\u5316\u53d1\u751f\u5728\u6587\u4ef6\u7684 &#8220;\u76f8\u540c\u533a\u57df\uff08Same region\uff09&#8221;\u3002\u540c\u4e00\u533a\u57df\u610f\u5473\u7740\u5f00\u53d1\u8005\u5728\u6587\u4ef6\u7684\u540c\u4e00\u4f4d\u7f6e\uff08\u4f8b\u5982\uff0c\u6bb5\u843d\u3001\u884c\u7b49\uff09\u8fdb\u884c\u4e86\u4fee\u6539\u3002<\/li><\/ol>\n\n\n\n<p>\u5e78\u8fd0\u7684\u662f\uff0cGit \u4f7f\u7528 &#8220;\u81ea\u52a8\u5408\u5e76\uff08auto-merge\uff09&#8221; \u7b56\u7565\u81ea\u52a8\u5904\u7406\u4e86\u5927\u591a\u6570\u8fd9\u79cd\u60c5\u51b5\u3002\u4f46\u662f\u5f53\u8fd9\u4e9b\u53d8\u5316\u53d1\u751f\u5728\u6587\u4ef6\u7684 &#8220;\u540c\u4e00\u533a\u57df&#8221; \u65f6\uff0cGit \u4e0d\u4f1a\u6267\u884c\u81ea\u52a8\u5408\u5e76\u3002\u76f8\u53cd\uff0c\u5b83\u8ba9\u4f60\u53bb\u89e3\u51b3\u5408\u5e76\u7684\u51b2\u7a81\u3002<\/p>\n\n\n\n<p><strong>Git \u5408\u5e76\u51b2\u7a81\u3002\u4e00\u4e2a\u6050\u6016\u7684\u6545\u4e8b<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator\"\/>\n\n\n\n<p>\u8ba9\u6211\u4eec\u901a\u8fc7\u4e24\u4e2a\u5f00\u53d1\u5546 Alex \u548c Tina \u7684\u6545\u4e8b\u6765\u7406\u89e3\u4e0a\u8ff0\u60c5\u51b5\u3002<\/p>\n\n\n\n<p>\u4e00\u4e2a\u6674\u6717\u7684\u65e5\u5b50\uff0c<\/p>\n\n\n\n<ul><li>Alex \u628a\u8fdc\u7a0b\u7248\u672c\u5e93\u7684\u4fee\u6539\u62c9\u5230\u4ed6\u7684\u672c\u5730\u7248\u672c\u5e93\u3002<\/li><li>\u4ed6\u4fee\u6539\u4e86\u540d\u4e3a <code>abc.txt<\/code> \u7684\u6587\u4ef6\uff0c\u5c06\u5176\u6682\u5b58\uff08staged\uff09\uff0c\u63d0\u4ea4\uff08committed\uff09\uff0c\u6700\u540e\u63a8\u9001\uff08pushed\uff09\u56de\u8fdc\u7a0b\u7248\u672c\u5e93\u3002<\/li><li>\u540c\u65f6\uff0cTina \u4e0d\u77e5\u9053 Alex \u5bf9<code>abc.txt<\/code>\u6587\u4ef6\u7684\u4fee\u6539\uff0c\u5728\u8be5\u6587\u4ef6\u7684 <code>\u76f8\u540c\u533a\u57df<\/code> \u505a\u4e86\u4e00\u4e9b\u4fee\u6539\uff0c\u5e76\u5c1d\u8bd5\u5c06\u5176\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/li><li><code>Git<\/code>\u662f\u4e00\u4e2a\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u6240\u4ee5\u5b83\u8b66\u544a Tina\uff0c\u5979\u4fee\u6539\u7684\u7248\u672c\u6bd4\u8fdc\u7a0b\u4e2d\u7684\u7248\u672c\u8981\u65e9\uff08\u56e0\u4e3a Alex \u7684\u4fee\u6539\u5df2\u7ecf\u5728\u8fdc\u7a0b\u4e2d\uff09\u3002<\/li><li>\u73b0\u5728\uff0cTina \u9700\u8981\u5148\u4ece\u8fdc\u7a0b\u62c9\u51fa\u4fee\u6539\uff0c\u66f4\u65b0\u6587\u4ef6\uff0c\u7136\u540e\u518d\u5c1d\u8bd5\u63a8\u9001\u3002<\/li><li>Tina \u8fd9\u6837\u505a\u4e86\u3002\u7136\u800c\uff0c\u5728\u5979\u6700\u75af\u72c2\u7684\u5669\u68a6\u4e2d\uff0c\u5979\u5f97\u5230\u4e86 &#8220;\u81ea\u52a8\u5408\u5e76\uff08auto-merge\uff09&#8221; \u5931\u8d25\u7684\u8b66\u544a\uff0c\u6240\u4ee5\u5979\u73b0\u5728\u9700\u8981\u89e3\u51b3\u5408\u5e76\u51b2\u7a81\u3002<\/li><\/ul>\n\n\n\n<div class=\"wp-block-image\"><figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/123.57.164.21\/wp-content\/uploads\/2023\/03\/image-131-1024x605.png\" alt=\"\" class=\"wp-image-9797\" width=\"560\" height=\"331\" srcset=\"https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-131-1024x605.png 1024w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-131-300x177.png 300w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-131-768x454.png 768w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-131-830x491.png 830w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-131-230x136.png 230w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-131-350x207.png 350w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-131-480x284.png 480w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-131.png 1286w\" sizes=\"(max-width: 560px) 100vw, 560px\" \/><\/figure><\/div>\n\n\n\n<p>\u8fd9\u4e2a\u6545\u4e8b\u6709\u4ec0\u4e48\u5370\u8c61\u5417\uff1f\u4e0a\u8ff0\u6545\u4e8b\u4e0e\u4f60\u6709\u5173\u5417\uff1f\u6709\u53ef\u80fd\u4f60\u8fc7\u53bb\u66fe\u7ad9\u5728 Tina \u7684\u4f4d\u7f6e\u4e0a\u3002\u5982\u679c\u6ca1\u6709\uff0c\u4f60\u6700\u7ec8\u4f1a\u9047\u5230\u8fd9\u79cd\u60c5\u51b5! \u90a3\u4e48\uff0c\u8ba9\u6211\u4eec\u6765\u4e86\u89e3 Tina \u5982\u4f55\u6709\u6548\u5730\u5904\u7406\u8fd9\u79cd\u60c5\u51b5\u3002<\/p>\n\n\n\n<p><strong>\u5982\u4f55\u89e3\u51b3 Git \u4e2d\u7684\u5408\u5e76\u51b2\u7a81<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator\"\/>\n\n\n\n<p>\u89e3\u51b3\u5408\u5e76\u51b2\u7a81\u5e76\u4e0d\u50cf\u5b83\u542c\u8d77\u6765\u90a3\u4e48\u68d8\u624b\u3002\u5728 90%\u7684\u60c5\u51b5\u4e0b\uff0c\u4e00\u65e6\u4f60\u5bf9\u53d8\u5316\u6709\u4e86\u6e05\u6670\u7684\u8ba4\u8bc6\uff0c\u5e76\u6709\u4e00\u4e2a\u5e73\u548c\u7684\u5fc3\u6001\uff0c\u5c31\u4f1a\u6bd4\u8f83\u5bb9\u6613\u3002<\/p>\n\n\n\n<p><strong>\u601d\u8003\u8fc7\u7a0b<\/strong><\/p>\n\n\n\n<p>\u5f53 Tina \u62c9\u53d6\u4e86\u8fd9\u4e9b\u4fee\u6539\uff0cTina \u7684\u672c\u5730\u6587\u4ef6\u5c31\u6709 Tina \u7684\u4fee\u6539\u548c Alex \u7684\u4fee\u6539\u3002\u73b0\u5728 Tina \u53ef\u4ee5\u505a\u8fd9\u56db\u4ef6\u4e8b\u4e2d\u9009\u62e9\u4e00\u4ef6:<\/p>\n\n\n\n<ul><li>\u5979\u53ef\u4ee5\u4fdd\u7559 Alex \u7684\u4fee\u6539\u5e76\u5220\u9664\u5979\u7684\u4fee\u6539\u3002<\/li><li>\u5979\u53ef\u4ee5\u5220\u9664 Alex \u7684\u4fee\u6539\u5e76\u4fdd\u7559\u5979\u7684\u4fee\u6539\u3002<\/li><li>\u5979\u53ef\u4ee5\u540c\u65f6\u4fdd\u7559 Alex \u7684\u548c\u5979\u7684\u4fee\u6539\u3002<\/li><li>\u5979\u53ef\u4ee5\u540c\u65f6\u5220\u9664 Alex \u7684\u548c\u5979\u7684\u6539\u52a8\u3002<\/li><\/ul>\n\n\n\n<p>\u597d\u5427\uff0c\u4f46\u5979\u5e94\u8be5\u505a\u54ea\u4e00\u4e2a\uff1f\u8fd9\u5b8c\u5168\u53d6\u51b3\u4e8e\u9879\u76ee\u7684\u9700\u6c42\u548c\u7528\u4f8b\u3002Tina \u4f1a\u7406\u89e3\u8981\u505a\u7684\u53d8\u5316\uff0c\u5e76\u505a\u4efb\u4f55\u4e0e\u60c5\u51b5\u76f8\u5173\u7684\u4e8b\u60c5\u3002<\/p>\n\n\n\n<p>\u90a3\u4e48\uff0c\u4ec0\u4e48\u662f\u8981\u505a\u7684\u53d8\u5316\uff1fTina \u5982\u4f55\u8bc6\u522b\uff1fTina \u5982\u4f55\u505a\u51fa\u6539\u53d8\uff1f\u6211\u77e5\u9053\u4f60\u6709\u5f88\u591a\u8fd9\u6837\u7684\u95ee\u9898\u3002\u8ba9\u6211\u4eec\u901a\u8fc7\u4e0b\u9762\u4e00\u8282\u4e2d\u7684\u51e0\u4e2a\u73b0\u5b9e\u751f\u6d3b\u4e2d\u7684\u4f8b\u5b50\u6765\u83b7\u5f97\u6240\u6709\u7684\u7b54\u6848\u3002<\/p>\n\n\n\n<p><strong>\u89e3\u51b3 Git \u4e2d\u5408\u5e76\u51b2\u7a81\u7684\u6b65\u9aa4<\/strong><\/p>\n\n\n\n<p>\u8ba9\u6211\u4eec\u4e3e\u51e0\u4e2a\u73b0\u5b9e\u751f\u6d3b\u4e2d\u7684\u5408\u5e76\u51b2\u7a81\u7684\u4f8b\u5b50\uff0c\u5e76\u5b66\u4e60\u5982\u4f55\u89e3\u51b3\u5b83\u4eec\u3002<\/p>\n\n\n\n<p><strong>\u4f8b\u5b50 1\uff1a\u6539\u53d8\u662f\u5728\u6587\u4ef6\u7684\u540c\u4e00\u5730\u533a<\/strong><\/p>\n\n\n\n<p>\u5f53 Git \u65e0\u6cd5\u6267\u884c\u81ea\u52a8\u5408\u5e76\u65f6\uff0c\u56e0\u4e3a\u66f4\u6539\u5728\u540c\u4e00\u533a\u57df\uff0c\u5b83\u4f1a\u7528\u7279\u6b8a\u5b57\u7b26\u6765\u8868\u793a\u51b2\u7a81\u7684\u533a\u57df\u3002\u8fd9\u4e9b\u5b57\u7b26\u5e8f\u5217\u662f\u8fd9\u6837\u7684:<\/p>\n\n\n\n<div class=\"wp-block-image\"><figure class=\"aligncenter size-full is-resized\"><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/123.57.164.21\/wp-content\/uploads\/2023\/03\/image-132.png\" alt=\"\" class=\"wp-image-9798\" width=\"115\" height=\"90\"\/><\/figure><\/div>\n\n\n\n<p><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;<\/code>\u548c<code>=======<\/code>\u4e4b\u95f4\u7684\u6240\u6709\u5185\u5bb9\u90fd\u662f\u4f60\u7684\u672c\u5730\u4fee\u6539\u3002 \u8fd9\u4e9b\u4fee\u6539\u8fd8\u6ca1\u6709\u5728\u8fdc\u7a0b\u7248\u672c\u5e93\u4e2d\u3002<code>=======<\/code>\u548c<code>>>>>>>><\/code>\u4e4b\u95f4\u7684\u6240\u6709\u884c\u90fd\u662f\u6765\u81ea\u8fdc\u7a0b\u7248\u672c\u5e93\u6216\u53e6\u4e00\u4e2a\u5206\u652f\u7684\u4fee\u6539\u3002\u73b0\u5728\u4f60\u9700\u8981\u7814\u7a76\u8fd9\u4e24\u4e2a\u90e8\u5206\u5e76\u505a\u51fa\u51b3\u5b9a\u3002<\/p>\n\n\n\n<p>\u4e0b\u9762\u7684\u56fe\u7247\u663e\u793a\u4e86\u4e00\u4e2a\u6587\u4ef6\u7684\u5185\u5bb9\uff0c\u8868\u660e\u81ea\u52a8\u5408\u5e76\u6ca1\u6709\u53d1\u751f\uff0c\u6709\u4e00\u4e2a\u51b2\u7a81\u3002\u51b2\u7a81\u53d1\u751f\u5728\u6211\u4eec\u5728\u672c\u5730\u4fee\u6539\u4e86\u6587\u4ef6\uff0c\u589e\u52a0\u4e86\u4e00\u884c<code>- Sleep<\/code>\u3002\u4f46\u4e0e\u6b64\u540c\u65f6\uff0c\u5176\u4ed6\u4eba\u5728\u540c\u4e00\u533a\u57df\u6dfb\u52a0\u4e86 <code>- Gym<\/code> \u884c\uff0c\u4ece\u800c\u63a8\u9001\u4e86\u4e00\u4e2a\u4fee\u6539\u3002<\/p>\n\n\n\n<p>\u56e0\u6b64\uff0c<code>- Sleep<\/code>\u884c\u88ab\u6807\u8bb0\u4e3a\u672c\u5730\u4fee\u6539\uff0c<code>- Gym<\/code>\u884c\u88ab\u6807\u8bb0\u4e3a\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u6216\u5176\u4ed6\u5206\u652f\u4f20\u5165\u7684\u4fee\u6539\u3002<\/p>\n\n\n\n<div class=\"wp-block-image\"><figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/123.57.164.21\/wp-content\/uploads\/2023\/03\/image-133-1024x543.png\" alt=\"\" class=\"wp-image-9799\" width=\"597\" height=\"316\" srcset=\"https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-133-1024x543.png 1024w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-133-300x159.png 300w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-133-768x408.png 768w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-133-830x440.png 830w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-133-230x122.png 230w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-133-350x186.png 350w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-133-480x255.png 480w, https:\/\/92it.top\/wp-content\/uploads\/2023\/03\/image-133.png 1270w\" sizes=\"(max-width: 597px) 100vw, 597px\" \/><\/figure><\/div>\n\n\n\n<p>\u7531\u4e8e\u540c\u4e00\u533a\u57df\u7684\u53d8\u5316\u800c\u4ea7\u751f\u7684\u5408\u5e76\u51b2\u7a81<\/p>\n\n\n\n<p>\u6839\u636e\u4f60\u7684\u7528\u4f8b\u548c\u9879\u76ee\u7684\u9700\u8981\uff0c\u4f60\u5c06\u505a\u51fa\u89e3\u51b3\u51b2\u7a81\u7684\u51b3\u5b9a\u3002\u5982\u679c\u4f60\u53ea\u9700\u8981\u4fdd\u7559\u5e26\u6709 <code>- Sleep<\/code> \u7684\u90a3\u4e00\u884c\uff0c\u4f60\u5c06\u4fdd\u7559\u8fd9\u4e00\u884c\uff0c\u5e76\u5220\u9664\u5176\u4f59\u51b2\u7a81\u7684\u6587\u672c\u3002\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u6587\u4ef6\u5185\u5bb9\u53d8\u6210:<\/p>\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=\"\">- Eat\n- Read\n- Sleep<\/pre>\n\n\n\n<p>\u76f8\u53cd\uff0c\u4f60\u53ef\u4ee5\u4fdd\u7559 <code>- Gym<\/code> \u8fd9\u4e00\u884c\uff0c\u5e76\u5220\u9664 <code>- Sleep<\/code>\u7684\u4fee\u6539:<\/p>\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=\"\">- Eat\n- Read\n- Gym<\/pre>\n\n\n\n<p>\u5982\u679c\u4f60\u9700\u8981\u4fdd\u7559\u8fd9\u4e24\u884c\uff0c\u8bf7\u5220\u9664\u4e0e\u51b2\u7a81\u6307\u6807\u6709\u5173\u7684\u7ebf:<\/p>\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=\"\">- Eat\n- Read\n- Sleep\n- Gym<\/pre>\n\n\n\n<p>\u5982\u679c\u4f60\u8ba4\u4e3a\u4e0d\u9700\u8981\u4efb\u4f55\u4fee\u6539\uff0c\u5c31\u628a\u5b83\u4eec\u5168\u90e8\u5220\u9664\u5427\u3002<\/p>\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=\"\">- Eat\n- Read<\/pre>\n\n\n\n<p>\u5b8c\u5168\u7531\u4f60\u6765\u51b3\u5b9a\u54ea\u4e9b\u4fee\u6539\u4e0e\u60c5\u51b5\u6709\u5173\u3002\u5728\u4f60\u7684\u4fee\u6539\u4e4b\u540e\uff0c\u4f60\u9700\u8981\u786e\u4fdd\u6587\u4ef6\u4e2d\u4e0d\u5b58\u5728\u4efb\u4f55\u63d0\u793a\u51b2\u7a81\u7684\u5b57\u7b26\uff08&lt;&lt;&lt;&lt;&lt;&lt;&lt;, =======, >>>>>>>\uff09\u3002\u5f53\u4f60\u89e3\u51b3\u4e86\u8fd9\u4e9b\u4fee\u6539\uff0c\u8bf7\u505a\u4ee5\u4e0b\u5de5\u4f5c:<\/p>\n\n\n\n<p>\u6682\u5b58\u53d8\u5316:<\/p>\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 add &lt;files><\/pre>\n\n\n\n<p>\u63d0\u4ea4\u4fee\u6539\uff0c\u5e76\u6dfb\u52a0\u4fe1\u606f:<\/p>\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 commit -m \"Message\"<\/pre>\n\n\n\n<p>\u6700\u540e\uff0c\u5c06\u53d8\u5316\u63a8\u9001\u5230\u8fdc\u7a0b:<\/p>\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 push<\/pre>\n\n\n\n<p>\u8fd9\u5c31\u662f\u89e3\u51b3\u8fd9\u79cd\u60c5\u51b5\u4e0b\u7684\u5408\u5e76\u51b2\u7a81\u7684\u5168\u90e8\u5185\u5bb9\u3002<\/p>\n\n\n\n<p><strong>\u4f8b 2\uff1a\u6587\u4ef6\u5728 Remote\/Other \u5206\u652f\u88ab\u5220\u9664<\/strong><\/p>\n\n\n\n<p>\u5728\u5220\u9664\u6587\u4ef6\u7684\u5408\u5e76\u51b2\u7a81\u4e2d\uff0c\u4e00\u4e2a\u5f00\u53d1\u8005\u5728\u4e00\u4e2a\u5206\u652f\u4e2d\u5220\u9664\u4e86\u4e00\u4e2a\u6587\u4ef6\uff0c\u800c\u53e6\u4e00\u4e2a\u5f00\u53d1\u8005\u5728\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u7f16\u8f91\u4e86\u540c\u4e00\u4e2a\u6587\u4ef6\u3002\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u4f60\u9700\u8981\u51b3\u5b9a\u662f\u5426\u8981\u4fdd\u7559\u8fd9\u4e2a\u6587\u4ef6\uff0c\u6216\u8005\u5220\u9664\u5b83\u662f\u5426\u6b63\u786e\u3002<\/p>\n\n\n\n<p>\u8981\u628a\u88ab\u5220\u9664\u7684\u6587\u4ef6\u52a0\u56de\u4f60\u7684\u5206\u652f\uff0c\u8bf7\u8fd9\u6837\u505a:<\/p>\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 add &lt;file-name><\/pre>\n\n\n\n<p>\u8981\u7ee7\u7eed\u5220\u9664\u6587\u4ef6\uff0c\u8bf7\u8fd9\u6837\u505a:<\/p>\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 rm &lt;file-name><\/pre>\n\n\n\n<p>\u7136\u540e\u63d0\u4ea4\u4f60\u7684\u4fee\u6539\uff0c\u5e76\u6dfb\u52a0\u6d88\u606f:<\/p>\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 commit -m \"Message\"<\/pre>\n\n\n\n<p>Finally, push it:<\/p>\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 push<\/pre>\n","protected":false},"excerpt":{"rendered":"<p>Git \u662f\u4e00\u4e2a\u5f00\u6e90\u7684\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u3002\u5b83\u5e2e\u52a9\u4f60\u4f7f\u7528\u672c\u5730\u5206\u652f\u3001\u6682\u5b58\u548c\u5de5\u4f5c\u6d41\u7a0b\u8f7b\u677e\u7ba1\u7406\u4f60\u7684\u9879\u76ee\u6587\u4ef6\u3002 \u73b0\u5728\u5f88\u591a\u5f00 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[26],"tags":[],"_links":{"self":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/9793"}],"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=9793"}],"version-history":[{"count":2,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/9793\/revisions"}],"predecessor-version":[{"id":9801,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/9793\/revisions\/9801"}],"wp:attachment":[{"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=9793"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=9793"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=9793"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}