{"id":19578,"date":"2024-11-19T17:54:40","date_gmt":"2024-11-19T09:54:40","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19578\/"},"modified":"2024-11-19T17:54:40","modified_gmt":"2024-11-19T09:54:40","slug":"%e8%af%a6%e8%a7%a3git%e4%b8%ad%e6%80%8e%e4%b9%88%e6%9f%a5%e7%9c%8b%e5%86%b2%e7%aa%81","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19578\/","title":{"rendered":"\u8be6\u89e3git\u4e2d\u600e\u4e48\u67e5\u770b\u51b2\u7a81"},"content":{"rendered":"<p>\u5728\u56e2\u961f\u534f\u4f5c\u4e2d\uff0cgit \u662f\u975e\u5e38\u5e38\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u3002\u4f46\u662f\u5728\u591a\u4eba\u540c\u65f6\u4fee\u6539\u540c\u4e00\u4e2a\u6587\u4ef6\u6216\u8005\u540c\u4e00\u4e2a\u4ee3\u7801\u5e93\u65f6\uff0c\u5c31\u53ef\u80fd\u51fa\u73b0\u51b2\u7a81\u3002\u5982\u679c\u6709\u4eba\u5728\u672c\u5730\u5df2\u7ecf\u4fee\u6539\u4e86\u67d0\u4e2a\u6587\u4ef6\u5e76\u63d0\u4ea4\u4e86\uff0c\u4f46\u53e6\u4e00\u4e2a\u4eba\u5728\u8fdc\u7a0b\u4e5f\u4fee\u6539\u4e86\u8fd9\u4e2a\u6587\u4ef6\u5e76\u63d0\u4ea4\u4e86\uff0c\u8fd9\u65f6\u5019\u5c31\u4f1a\u51fa\u73b0\u51b2\u7a81\u3002<\/p>\n<p>\u90a3\u4e48\u5728 Git \u4e2d\uff0c\u5982\u4f55\u67e5\u770b\u51b2\u7a81\u5462\uff1f\u4e0b\u9762\u6211\u4eec\u5c31\u6765\u4ecb\u7ecd\u4e00\u4e0b\u3002<\/p>\n<ol>\n<li>\u68c0\u67e5\u662f\u5426\u5b58\u5728\u51b2\u7a81<\/li>\n<\/ol>\n<p>\u5728 Git \u4e2d\uff0c\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u68c0\u67e5\u5f53\u524d\u6587\u4ef6\u662f\u5426\u5b58\u5728\u51b2\u7a81\uff1a<\/p>\n<pre>$ git status<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5982\u679c\u51fa\u73b0\u7c7b\u4f3c\u5982\u4e0b\u8f93\u51fa\uff0c\u5219\u8bf4\u660e\u5f53\u524d\u6587\u4ef6\u5b58\u5728\u51b2\u7a81\uff1a<\/p>\n<pre>On branch master\nYou have unmerged paths.\n  (fix conflicts and run \"git commit\")<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<ol>\n<li>\u67e5\u770b\u51b2\u7a81\u6587\u4ef6<\/li>\n<\/ol>\n<p>\u5728\u68c0\u67e5\u51fa\u5b58\u5728\u51b2\u7a81\u540e\uff0c\u6211\u4eec\u9700\u8981\u67e5\u770b\u5177\u4f53\u54ea\u4e9b\u6587\u4ef6\u5b58\u5728\u51b2\u7a81\uff0c\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u67e5\u770b\uff1a<\/p>\n<pre>$ git diff --name-only --diff-filter=U<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5176\u4e2d &#8211;name-only \u53c2\u6570\u8868\u793a\u53ea\u663e\u793a\u6587\u4ef6\u540d\uff0c&#8211;diff-filter=U \u53c2\u6570\u8868\u793a\u663e\u793a\u51b2\u7a81\u6587\u4ef6\u3002<\/p>\n<ol>\n<li>\u89e3\u51b3\u51b2\u7a81<\/li>\n<\/ol>\n<p>\u901a\u8fc7\u67e5\u770b\u51b2\u7a81\u6587\u4ef6\uff0c\u6211\u4eec\u53ef\u4ee5\u77e5\u9053\u54ea\u4e9b\u6587\u4ef6\u5b58\u5728\u51b2\u7a81\u3002\u63a5\u4e0b\u6765\uff0c\u6211\u4eec\u9700\u8981\u624b\u52a8\u53bb\u89e3\u51b3\u51b2\u7a81\u3002<\/p>\n<p>\u9996\u5148\uff0c\u6211\u4eec\u9700\u8981\u6253\u5f00\u5b58\u5728\u51b2\u7a81\u7684\u6587\u4ef6\uff0c\u5177\u4f53\u7684\u51b2\u7a81\u4f4d\u7f6e\u4f1a\u7528\u7279\u6b8a\u7684\u7b26\u53f7\u6807\u8bb0\u51fa\u6765\uff0c\u4f8b\u5982\uff1a<\/p>\n<pre>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\n\u8fd9\u91cc\u662f\u672c\u5730\u4fee\u6539\u7684\u5185\u5bb9\n=======\n\u8fd9\u91cc\u662f\u8fdc\u7a0b\u4fee\u6539\u7684\u5185\u5bb9\n&gt;&gt;&gt;&gt;&gt;&gt;&gt; branch_name<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>&gt;&gt;&gt;&gt;&gt;&gt; branch_name \u4e4b\u95f4\u8868\u793a\u8fdc\u7a0b\u4fee\u6539\u7684\u5185\u5bb9\u3002<\/p>\n<p>\u6211\u4eec\u9700\u8981\u6839\u636e\u5b9e\u9645\u60c5\u51b5\u9009\u62e9\u4fdd\u7559\u54ea\u4e00\u90e8\u5206\u6216\u8005\u8fdb\u884c\u624b\u52a8\u5408\u5e76\u3002\u5408\u5e76\u5b8c\u6210\u540e\uff0c\u518d\u6b21\u63d0\u4ea4\u4fee\u6539\u5373\u53ef\u89e3\u51b3\u51b2\u7a81\u3002<\/p>\n<ol>\n<li>\u63d0\u4ea4\u89e3\u51b3\u65b9\u6848<\/li>\n<\/ol>\n<p>\u5f53\u51b2\u7a81\u89e3\u51b3\u5b8c\u6210\u540e\uff0c\u6211\u4eec\u9700\u8981\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u63d0\u4ea4\u89e3\u51b3\u65b9\u6848\uff1a<\/p>\n<pre>$ git add &lt;file_name&gt;\n$ git commit<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5176\u4e2d  \u662f\u5b58\u5728\u51b2\u7a81\u7684\u6587\u4ef6\u540d\u3002 <\/p>\n<ol>\n<li>\u67e5\u770b\u63d0\u4ea4\u5386\u53f2<\/li>\n<\/ol>\n<p>\u6700\u540e\uff0c\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u67e5\u770b\u63d0\u4ea4\u5386\u53f2\uff1a<\/p>\n<pre>$ git log<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5982\u679c\u663e\u793a Merge branch &#8216;  &#8216;\uff0c\u5219\u8bf4\u660e\u51b2\u7a81\u5df2\u7ecf\u6210\u529f\u89e3\u51b3\u3002 <\/p>\n<p>\u603b\u7ed3<\/p>\n<p>\u5728\u56e2\u961f\u534f\u4f5c\u4e2d\uff0c\u51b2\u7a81\u662f\u5e38\u89c1\u7684\u95ee\u9898\u3002\u901a\u8fc7\u4e0a\u8ff0\u4ecb\u7ecd\uff0c\u6211\u4eec\u53ef\u4ee5\u5728 Git \u4e2d\u4e86\u89e3\u5982\u4f55\u67e5\u770b\u51b2\u7a81\u3001\u89e3\u51b3\u51b2\u7a81\u5e76\u63d0\u4ea4\u89e3\u51b3\u65b9\u6848\u3002\u5728\u5b9e\u9645\u5f00\u53d1\u4e2d\uff0c\u53ca\u65f6\u7684\u89e3\u51b3\u51b2\u7a81\u53ef\u4ee5\u63d0\u9ad8\u56e2\u961f\u534f\u4f5c\u6548\u7387\uff0c\u66f4\u597d\u7684\u63a8\u8fdb\u9879\u76ee\u8fdb\u5c55\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662f\u8be6\u89e3git\u4e2d\u600e\u4e48\u67e5\u770b\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>\u5728\u56e2\u961f\u534f\u4f5c\u4e2d\uff0cgit \u662f\u975e\u5e38\u5e38\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u3002\u4f46\u662f\u5728\u591a\u4eba\u540c\u65f6\u4fee\u6539\u540c\u4e00\u4e2a\u6587\u4ef6\u6216\u8005\u540c\u4e00\u4e2a\u4ee3\u7801\u5e93\u65f6\uff0c\u5c31\u53ef\u80fd\u51fa\u73b0\u51b2\u7a81\u3002\u5982\u679c\u6709\u4eba\u5728\u672c\u5730\u5df2\u7ecf\u4fee\u6539\u4e86\u67d0\u4e2a\u6587\u4ef6\u5e76\u63d0\u4ea4\u4e86\uff0c\u4f46\u53e6\u4e00\u4e2a\u4eba\u5728\u8fdc\u7a0b\u4e5f\u4fee\u6539\u4e86\u8fd9\u4e2a\u6587\u4ef6\u5e76\u63d0\u4ea4\u4e86\uff0c\u8fd9\u65f6\u5019\u5c31\u4f1a\u51fa\u73b0\u51b2\u7a81\u3002 \u90a3\u4e48\u5728 Git \u4e2d\uff0c\u5982\u4f55\u67e5\u770b\u51b2\u7a81\u5462\uff1f\u4e0b\u9762\u6211\u4eec\u5c31\u6765\u4ecb\u7ecd\u4e00\u4e0b\u3002 \u68c0\u67e5\u662f\u5426\u5b58\u5728\u51b2\u7a81 \u5728 Git \u4e2d\uff0c\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u68c0\u67e5\u5f53\u524d\u6587\u4ef6\u662f\u5426\u5b58\u5728\u51b2\u7a81\uff1a $ git status \u767b\u5f55\u540e\u590d\u5236 \u5982\u679c\u51fa\u73b0\u7c7b\u4f3c\u5982\u4e0b\u8f93\u51fa\uff0c\u5219\u8bf4\u660e\u5f53\u524d\u6587\u4ef6\u5b58\u5728\u51b2\u7a81\uff1a On branch master You have unmerged paths. (fix conflicts and run &#8220;git commit&#8221;) \u767b\u5f55\u540e\u590d\u5236 \u67e5\u770b\u51b2\u7a81\u6587\u4ef6 \u5728\u68c0\u67e5\u51fa\u5b58\u5728\u51b2\u7a81\u540e\uff0c\u6211\u4eec\u9700\u8981\u67e5\u770b\u5177\u4f53\u54ea\u4e9b\u6587\u4ef6\u5b58\u5728\u51b2\u7a81\uff0c\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u67e5\u770b\uff1a $ git diff &#8211;name-only &#8211;diff-filter=U \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d &#8211;name-only \u53c2\u6570\u8868\u793a\u53ea\u663e\u793a\u6587\u4ef6\u540d\uff0c&#8211;diff-filter=U \u53c2\u6570\u8868\u793a\u663e\u793a\u51b2\u7a81\u6587\u4ef6\u3002 \u89e3\u51b3\u51b2\u7a81 \u901a\u8fc7\u67e5\u770b\u51b2\u7a81\u6587\u4ef6\uff0c\u6211\u4eec\u53ef\u4ee5\u77e5\u9053\u54ea\u4e9b\u6587\u4ef6\u5b58\u5728\u51b2\u7a81\u3002\u63a5\u4e0b\u6765\uff0c\u6211\u4eec\u9700\u8981\u624b\u52a8\u53bb\u89e3\u51b3\u51b2\u7a81\u3002 \u9996\u5148\uff0c\u6211\u4eec\u9700\u8981\u6253\u5f00\u5b58\u5728\u51b2\u7a81\u7684\u6587\u4ef6\uff0c\u5177\u4f53\u7684\u51b2\u7a81\u4f4d\u7f6e\u4f1a\u7528\u7279\u6b8a\u7684\u7b26\u53f7\u6807\u8bb0\u51fa\u6765\uff0c\u4f8b\u5982\uff1a &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD \u8fd9\u91cc\u662f\u672c\u5730\u4fee\u6539\u7684\u5185\u5bb9 ======= \u8fd9\u91cc\u662f\u8fdc\u7a0b\u4fee\u6539\u7684\u5185\u5bb9 &gt;&gt;&gt;&gt;&gt;&gt;&gt; branch_name \u767b\u5f55\u540e\u590d\u5236 &gt;&gt;&gt;&gt;&gt;&gt; branch_name \u4e4b\u95f4\u8868\u793a\u8fdc\u7a0b\u4fee\u6539\u7684\u5185\u5bb9\u3002 \u6211\u4eec\u9700\u8981\u6839\u636e\u5b9e\u9645\u60c5\u51b5\u9009\u62e9\u4fdd\u7559\u54ea\u4e00\u90e8\u5206\u6216\u8005\u8fdb\u884c\u624b\u52a8\u5408\u5e76\u3002\u5408\u5e76\u5b8c\u6210\u540e\uff0c\u518d\u6b21\u63d0\u4ea4\u4fee\u6539\u5373\u53ef\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-19578","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19578","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=19578"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19578\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19578"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19578"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19578"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}