{"id":20300,"date":"2024-11-19T17:43:49","date_gmt":"2024-11-19T09:43:49","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20300\/"},"modified":"2024-11-19T17:43:49","modified_gmt":"2024-11-19T09:43:49","slug":"git%e5%a6%82%e4%bd%95%e5%8f%91%e7%8e%b0%e5%86%b2%e7%aa%81","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20300\/","title":{"rendered":"git\u5982\u4f55\u53d1\u73b0\u51b2\u7a81"},"content":{"rendered":"<p>\u968f\u7740\u8f6f\u4ef6\u5f00\u53d1\u65e5\u76ca\u590d\u6742\uff0c\u534f\u4f5c\u5de5\u4f5c\u4e5f\u53d8\u5f97\u66f4\u52a0\u5173\u952e\u3002\u4e3a\u4e86\u80fd\u591f\u9ad8\u6548\u3001\u6709\u5e8f\u5730\u534f\u4f5c\uff0c\u5f00\u53d1\u4eba\u5458\u4f7f\u7528\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0cgit \u4fbf\u662f\u5176\u4e2d\u4e00\u79cd\u3002\u7136\u800c\uff0c\u5728\u591a\u4eba\u540c\u65f6\u4fee\u6539\u540c\u4e00\u4efd\u4ee3\u7801\u65f6\uff0c\u53ef\u80fd\u4f1a\u51fa\u73b0\u51b2\u7a81\uff08conflict\uff09\u7684\u60c5\u51b5\u3002\u672c\u6587\u5c06\u89e3\u91ca git \u5982\u4f55\u53d1\u73b0\u51b2\u7a81\u4ee5\u53ca\u5982\u4f55\u89e3\u51b3\u5b83\u4eec\u3002<\/p>\n<h2>\u4ec0\u4e48\u662f Git \u51b2\u7a81<\/h2>\n<p>\u5728\u4f7f\u7528 Git \u8fdb\u884c\u534f\u540c\u5f00\u53d1\u65f6\uff0c\u5982\u679c\u591a\u4e2a\u5f00\u53d1\u4eba\u5458\u5728\u540c\u4e00\u4efd\u4ee3\u7801\u6587\u4ef6\u7684\u76f8\u540c\u4f4d\u7f6e\u8fdb\u884c\u4e86\u4fee\u6539\uff0cGit \u5c31\u4f1a\u5c06\u6b64\u7c7b\u60c5\u51b5\u89c6\u4e3a\u4ee3\u7801\u51b2\u7a81\u3002\u4f8b\u5982\uff0c\u5728\u4e00\u4e2a\u56e2\u961f\u4e2d\uff0c\u5982\u679c\u4e24\u4e2a\u5f00\u53d1\u4eba\u5458\u5728\u540c\u4e00\u4efd\u4ee3\u7801\u6587\u4ef6\u7684\u540c\u4e00\u884c\u6dfb\u52a0\u4ee3\u7801\uff0cGit \u4fbf\u4f1a\u5c06\u6b64\u4fee\u6539\u89c6\u4e3a\u4e00\u79cd\u51b2\u7a81\uff0c\u56e0\u4e3a Git \u4e0d\u77e5\u9053\u4ee5\u54ea\u79cd\u53d8\u5316\u65b9\u5f0f\u6765\u4fdd\u5b58\u8fd9\u4e2a\u51b2\u7a81\u6587\u4ef6\u3002<\/p>\n<h2>Git \u5982\u4f55\u5bdf\u89c9\u51b2\u7a81<\/h2>\n<p>Git \u901a\u8fc7\u6bd4\u8f83\u4e24\u4e2a\u5206\u652f\u4e4b\u95f4\u7684\u5dee\u5f02\u6765\u53d1\u73b0\u51b2\u7a81\u3002\u5f53\u4e00\u4e2a\u5f00\u53d1\u4eba\u5458\u7684\u5206\u652f\uff08branch A\uff09\u548c\u53e6\u4e00\u4e2a\u5f00\u53d1\u4eba\u5458\u7684\u5206\u652f\uff08branch B\uff09\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u4efd\u4ee3\u7801\u6587\u4ef6\uff0cGit \u5c31\u4f1a\u5728\u5408\u5e76\u5206\u652f\u65f6\u53d1\u73b0\u8fd9\u4e2a\u95ee\u9898\u3002\u6b64\u65f6\uff0cGit \u9700\u8981\u6bd4\u8f83\u7248\u672c\u63a7\u5236\u670d\u52a1\u5668\u4e0a\u7684\u4ee3\u7801\u5e93\uff08master branch\uff09\u548c\u5f00\u53d1\u4eba\u5458\u7684\u5de5\u4f5c\u5206\u652f\uff08branch A \u548c branch B\uff09\u4e4b\u95f4\u7684\u5dee\u5f02\uff0c\u4ece\u800c\u786e\u5b9a\u53d1\u751f\u4e86\u4ee3\u7801\u51b2\u7a81\u3002\u5728 Git \u4e2d\uff0c\u5408\u5e76\u5206\u652f\u65f6\u4f1a\u51fa\u73b0\u4ee5\u4e0b\u60c5\u51b5\uff1a<\/p>\n<ul>\n<li>\u5982\u679c\u540c\u4e00\u884c\u5728\u5206\u652f A \u548c\u5206\u652f B \u4e2d\u4fee\u6539\uff0c\u5219 Git \u5c06\u5728\u5408\u5e76\u5206\u652f\u8fc7\u7a0b\u4e2d\u53d1\u73b0\u51b2\u7a81\uff0c\u5e76\u5c06\u8be5\u51b2\u7a81\u63d0\u9192\u5f00\u53d1\u4eba\u5458\uff0c\u7531\u4ed6\u4eec\u5904\u7406\u3002<\/li>\n<li>\u5982\u679c\u5206\u652f A \u6216\u5206\u652f B \u4fee\u6539\u4e86\u4ee3\u7801\u6587\u4ef6\u7684\u4e0d\u540c\u90e8\u5206\uff0cGit \u5c06\u5c1d\u8bd5\u5408\u5e76\u4e24\u4e2a\u5206\u652f\u7684\u4fee\u6539\u3002\u5982\u679c Git \u53d1\u73b0\u4e24\u4e2a\u5206\u652f\u4fee\u6539\u7684\u4ee3\u7801\u51b2\u7a81\uff0c\u5219 Git \u4f1a\u5728\u5408\u5e76\u8fc7\u7a0b\u4e2d\u89e6\u53d1\u4ee3\u7801\u51b2\u7a81\u8b66\u62a5\uff0c\u6211\u4eec\u9700\u8981\u624b\u52a8\u89e3\u51b3\u51b2\u7a81\u3002<\/li>\n<\/ul>\n<p>\u5728\u4ee5\u4e0a\u4e24\u79cd\u60c5\u51b5\u4e2d\uff0cGit \u90fd\u4f1a\u628a\u53d1\u73b0\u7684\u51b2\u7a81\u4fe1\u606f\u4fdd\u5b58\u5728\u5f53\u524d\u5206\u652f\u7684\u4fe1\u606f\u4e2d\uff0c\u8fd9\u6837\u5f00\u53d1\u4eba\u5458\u5c31\u53ef\u4ee5\u5728\u89e3\u51b3\u51b2\u7a81\u65f6\u4f7f\u7528\u8fd9\u4e2a\u4fe1\u606f\u3002<\/p>\n<h2>\u600e\u6837\u89e3\u51b3 Git \u51b2\u7a81<\/h2>\n<p>\u5f53 Git \u53d1\u73b0\u51b2\u7a81\u65f6\uff0c\u4f1a\u8ba9\u5f00\u53d1\u4eba\u5458\u901a\u8fc7\u4eba\u5de5\u5e72\u9884\u6765\u89e3\u51b3\u51b2\u7a81\u3002Git \u63d0\u4f9b\u4e86\u8bb8\u591a\u5de5\u5177\u548c\u547d\u4ee4\u6765\u5e2e\u52a9\u5f00\u53d1\u4eba\u5458\u89e3\u51b3\u51b2\u7a81\u3002<\/p>\n<h3>\u4f7f\u7528 diff \u547d\u4ee4\u67e5\u770b\u5dee\u5f02<\/h3>\n<p>\u5f53 Git \u53d1\u73b0\u4ee3\u7801\u51b2\u7a81\u65f6\uff0c\u5b83\u4f1a\u751f\u6210\u4e00\u4e2a\u5e26\u6709\u51b2\u7a81\u6807\u8bb0\u7684\u6587\u4ef6\u3002\u6b64\u6587\u4ef6\u663e\u793a\u51b2\u7a81\u4ee3\u7801\u7684\u4ece\u4e24\u4e2a\u4e0d\u540c\u5206\u652f\u4e2d\u63d0\u53d6\u7684\u4e0d\u540c\u5dee\u5f02\u3002\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528 diff \u547d\u4ee4\u6765\u67e5\u770b\u4ee3\u7801\u51b2\u7a81\uff0c\u547d\u4ee4\u4e3a\uff1a<\/p>\n<pre>$ git diff [conflicted_file]<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8be5\u547d\u4ee4\u5c06\u663e\u793a\u4ee3\u7801\u51b2\u7a81\u529f\u80fd\u5e76\u663e\u793a\u5dee\u5f02\u90e8\u5206\u3002<\/p>\n<h3>\u4f7f\u7528 mergetool \u89e3\u51b3\u51b2\u7a81<\/h3>\n<p>Git \u8fd8\u63d0\u4f9b\u4e86 Mergetool \u5de5\u5177\uff0c\u53ef\u7528\u4e8e\u89c6\u89c9\u4e0a\u89e3\u51b3\u51b2\u7a81\u3002Mergetool \u4f1a\u6253\u5f00\u51b2\u7a81\u6587\u4ef6\u5e76\u63d0\u4f9b three-way merge\uff0c\u5b83\u4e5f\u53ef\u4ee5\u8ba9\u5f00\u53d1\u4eba\u5458\u4e3b\u5bfc\u51b3\u7b56\u4ece\u800c\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\u3002\u5728 Linux \u7cfb\u7edf\u4e2d\uff0c\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7\u4e0b\u9762\u7684\u547d\u4ee4\u6765\u542f\u52a8 Mergetool\uff1a<\/p>\n<pre>$ git mergetool<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<h3>\u4f7f\u7528\u7f16\u8f91\u5668\u624b\u52a8\u89e3\u51b3\u51b2\u7a81<\/h3>\n<p>Git \u51b2\u7a81\u6587\u4ef6\u6700\u540e\u7684\u683c\u5f0f\u5982\u4e0b\uff1a<\/p>\n<pre>&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt; branchA<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u5f00\u53d1\u4eba\u5458\u9700\u8981\u624b\u52a8\u4fee\u6539\u6587\u4ef6\u6765\u89e3\u51b3\u51b2\u7a81\u3002\u901a\u5e38\uff0c\u53ef\u4ee5\u7528\u6587\u672c\u7f16\u8f91\u5668\u6253\u5f00\u5305\u542b\u51b2\u7a81\u7684\u6587\u4ef6\u5e76\u624b\u52a8\u89e3\u51b3\u51b2\u7a81\uff1b\u5728\u89e3\u51b3\u4e86\u6240\u6709\u7684\u51b2\u7a81\u4e4b\u540e\uff0c\u6211\u4eec\u5c31\u53ef\u4ee5\u4f7f\u7528\u4e0b\u9762\u7684\u547d\u4ee4\u5c06\u4fee\u6539\u63d0\u4ea4\u5230 Git \u4ed3\u5e93\uff1a<\/p>\n<pre>$ git add [resolved_file]             # \u5c06\u5df2\u7ecf\u89e3\u51b3\u7684\u6587\u4ef6\u52a0\u5165\u5230 Git \u7d22\u5f15\n$ git commit -m 'Resolve conflicts'   # \u63d0\u4ea4\u89e3\u51b3\u540e\u7684\u4fee\u6539\uff0c\u5199\u660e\u89e3\u51b3\u51b2\u7a81\u7684\u8fc7\u7a0b<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u603b\u4e4b\uff0cGit \u662f\u4e00\u4e2a\u5f3a\u5927\u800c\u53c8\u7a33\u5b9a\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u4f46\u662f\u5728\u591a\u4eba\u534f\u540c\u5f00\u53d1\u65f6\uff0c\u53ef\u80fd\u4f1a\u51fa\u73b0\u51b2\u7a81\u7684\u60c5\u51b5\u3002\u4e3a\u4e86\u89e3\u51b3\u8fd9\u4e9b\u51b2\u7a81\uff0c\u6211\u4eec\u9700\u8981\u5b66\u4f1a\u4f7f\u7528 Git \u63d0\u4f9b\u7684\u5de5\u5177\u548c\u547d\u4ee4\u6765\u5e2e\u52a9\u5f00\u53d1\u4eba\u5458\u89e3\u51b3\u51b2\u7a81\u3002\u901a\u8fc7\u719f\u6089\u548c\u4e86\u89e3 Git \u51b2\u7a81\u7684\u5904\u7406\u65b9\u6cd5\uff0c\u6211\u4eec\u53ef\u4ee5\u8f7b\u677e\u89e3\u51b3\u51b2\u7a81\uff0c\u5e76\u5728\u534f\u540c\u5de5\u4f5c\u4e2d\u66f4\u52a0\u9ad8\u6548\u3001\u6709\u5e8f\u5730\u5de5\u4f5c\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662fgit\u5982\u4f55\u53d1\u73b0\u51b2\u7a81\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u968f\u7740\u8f6f\u4ef6\u5f00\u53d1\u65e5\u76ca\u590d\u6742\uff0c\u534f\u4f5c\u5de5\u4f5c\u4e5f\u53d8\u5f97\u66f4\u52a0\u5173\u952e\u3002\u4e3a\u4e86\u80fd\u591f\u9ad8\u6548\u3001\u6709\u5e8f\u5730\u534f\u4f5c\uff0c\u5f00\u53d1\u4eba\u5458\u4f7f\u7528\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0cgit \u4fbf\u662f\u5176\u4e2d\u4e00\u79cd\u3002\u7136\u800c\uff0c\u5728\u591a\u4eba\u540c\u65f6\u4fee\u6539\u540c\u4e00\u4efd\u4ee3\u7801\u65f6\uff0c\u53ef\u80fd\u4f1a\u51fa\u73b0\u51b2\u7a81\uff08conflict\uff09\u7684\u60c5\u51b5\u3002\u672c\u6587\u5c06\u89e3\u91ca git \u5982\u4f55\u53d1\u73b0\u51b2\u7a81\u4ee5\u53ca\u5982\u4f55\u89e3\u51b3\u5b83\u4eec\u3002 \u4ec0\u4e48\u662f Git \u51b2\u7a81 \u5728\u4f7f\u7528 Git \u8fdb\u884c\u534f\u540c\u5f00\u53d1\u65f6\uff0c\u5982\u679c\u591a\u4e2a\u5f00\u53d1\u4eba\u5458\u5728\u540c\u4e00\u4efd\u4ee3\u7801\u6587\u4ef6\u7684\u76f8\u540c\u4f4d\u7f6e\u8fdb\u884c\u4e86\u4fee\u6539\uff0cGit \u5c31\u4f1a\u5c06\u6b64\u7c7b\u60c5\u51b5\u89c6\u4e3a\u4ee3\u7801\u51b2\u7a81\u3002\u4f8b\u5982\uff0c\u5728\u4e00\u4e2a\u56e2\u961f\u4e2d\uff0c\u5982\u679c\u4e24\u4e2a\u5f00\u53d1\u4eba\u5458\u5728\u540c\u4e00\u4efd\u4ee3\u7801\u6587\u4ef6\u7684\u540c\u4e00\u884c\u6dfb\u52a0\u4ee3\u7801\uff0cGit \u4fbf\u4f1a\u5c06\u6b64\u4fee\u6539\u89c6\u4e3a\u4e00\u79cd\u51b2\u7a81\uff0c\u56e0\u4e3a Git \u4e0d\u77e5\u9053\u4ee5\u54ea\u79cd\u53d8\u5316\u65b9\u5f0f\u6765\u4fdd\u5b58\u8fd9\u4e2a\u51b2\u7a81\u6587\u4ef6\u3002 Git \u5982\u4f55\u5bdf\u89c9\u51b2\u7a81 Git \u901a\u8fc7\u6bd4\u8f83\u4e24\u4e2a\u5206\u652f\u4e4b\u95f4\u7684\u5dee\u5f02\u6765\u53d1\u73b0\u51b2\u7a81\u3002\u5f53\u4e00\u4e2a\u5f00\u53d1\u4eba\u5458\u7684\u5206\u652f\uff08branch A\uff09\u548c\u53e6\u4e00\u4e2a\u5f00\u53d1\u4eba\u5458\u7684\u5206\u652f\uff08branch B\uff09\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u4efd\u4ee3\u7801\u6587\u4ef6\uff0cGit \u5c31\u4f1a\u5728\u5408\u5e76\u5206\u652f\u65f6\u53d1\u73b0\u8fd9\u4e2a\u95ee\u9898\u3002\u6b64\u65f6\uff0cGit \u9700\u8981\u6bd4\u8f83\u7248\u672c\u63a7\u5236\u670d\u52a1\u5668\u4e0a\u7684\u4ee3\u7801\u5e93\uff08master branch\uff09\u548c\u5f00\u53d1\u4eba\u5458\u7684\u5de5\u4f5c\u5206\u652f\uff08branch A \u548c branch B\uff09\u4e4b\u95f4\u7684\u5dee\u5f02\uff0c\u4ece\u800c\u786e\u5b9a\u53d1\u751f\u4e86\u4ee3\u7801\u51b2\u7a81\u3002\u5728 Git \u4e2d\uff0c\u5408\u5e76\u5206\u652f\u65f6\u4f1a\u51fa\u73b0\u4ee5\u4e0b\u60c5\u51b5\uff1a \u5982\u679c\u540c\u4e00\u884c\u5728\u5206\u652f A \u548c\u5206\u652f B \u4e2d\u4fee\u6539\uff0c\u5219 Git \u5c06\u5728\u5408\u5e76\u5206\u652f\u8fc7\u7a0b\u4e2d\u53d1\u73b0\u51b2\u7a81\uff0c\u5e76\u5c06\u8be5\u51b2\u7a81\u63d0\u9192\u5f00\u53d1\u4eba\u5458\uff0c\u7531\u4ed6\u4eec\u5904\u7406\u3002 \u5982\u679c\u5206\u652f A \u6216\u5206\u652f B \u4fee\u6539\u4e86\u4ee3\u7801\u6587\u4ef6\u7684\u4e0d\u540c\u90e8\u5206\uff0cGit \u5c06\u5c1d\u8bd5\u5408\u5e76\u4e24\u4e2a\u5206\u652f\u7684\u4fee\u6539\u3002\u5982\u679c Git \u53d1\u73b0\u4e24\u4e2a\u5206\u652f\u4fee\u6539\u7684\u4ee3\u7801\u51b2\u7a81\uff0c\u5219 Git \u4f1a\u5728\u5408\u5e76\u8fc7\u7a0b\u4e2d\u89e6\u53d1\u4ee3\u7801\u51b2\u7a81\u8b66\u62a5\uff0c\u6211\u4eec\u9700\u8981\u624b\u52a8\u89e3\u51b3\u51b2\u7a81\u3002 \u5728\u4ee5\u4e0a\u4e24\u79cd\u60c5\u51b5\u4e2d\uff0cGit \u90fd\u4f1a\u628a\u53d1\u73b0\u7684\u51b2\u7a81\u4fe1\u606f\u4fdd\u5b58\u5728\u5f53\u524d\u5206\u652f\u7684\u4fe1\u606f\u4e2d\uff0c\u8fd9\u6837\u5f00\u53d1\u4eba\u5458\u5c31\u53ef\u4ee5\u5728\u89e3\u51b3\u51b2\u7a81\u65f6\u4f7f\u7528\u8fd9\u4e2a\u4fe1\u606f\u3002 \u600e\u6837\u89e3\u51b3 Git \u51b2\u7a81 \u5f53 Git \u53d1\u73b0\u51b2\u7a81\u65f6\uff0c\u4f1a\u8ba9\u5f00\u53d1\u4eba\u5458\u901a\u8fc7\u4eba\u5de5\u5e72\u9884\u6765\u89e3\u51b3\u51b2\u7a81\u3002Git \u63d0\u4f9b\u4e86\u8bb8\u591a\u5de5\u5177\u548c\u547d\u4ee4\u6765\u5e2e\u52a9\u5f00\u53d1\u4eba\u5458\u89e3\u51b3\u51b2\u7a81\u3002 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[16],"tags":[],"class_list":["post-20300","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20300","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/comments?post=20300"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20300\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20300"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20300"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20300"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}