{"id":20043,"date":"2024-11-19T08:21:35","date_gmt":"2024-11-19T00:21:35","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20043\/"},"modified":"2024-11-19T08:21:35","modified_gmt":"2024-11-19T00:21:35","slug":"git-merge%e5%a4%b1%e8%b4%a5%e6%80%8e%e4%b9%88%e9%80%80%e5%9b%9e","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20043\/","title":{"rendered":"git merge\u5931\u8d25\u600e\u4e48\u9000\u56de"},"content":{"rendered":"

git\u662f\u73b0\u5728\u6700\u6d41\u884c\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u4e4b\u4e00\uff0c\u867d\u7136\u5b83\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u7ba1\u7406\u4ee3\u7801\uff0c\u4f46\u6709\u65f6\u5019\u6211\u4eec\u53ef\u80fd\u4f1a\u9047\u5230\u5408\u5e76\uff08merge\uff09\u7684\u95ee\u9898\uff0c\u6bd4\u5982\u5408\u5e76\u5931\u8d25\u3002\u5982\u679cgit\u5408\u5e76\u5931\u8d25\uff0c\u6211\u4eec\u8be5\u600e\u4e48\u9000\u56de\u5462\uff1f\u672c\u6587\u5c06\u4ecb\u7ecd\u51e0\u79cd\u65b9\u6cd5\u3002<\/p>\n

1. \u5f3a\u5236\u8986\u76d6\u5408\u5e76<\/h2>\n

\u5728\u5408\u5e76\u5206\u652f\u65f6\uff0c\u5982\u679c\u91c7\u7528\u4e86\u201c\u5408\u5e76\u51b2\u7a81\u201d\u7684\u65b9\u5f0f\uff0c\u4f46\u5408\u5e76\u5931\u8d25\u4e86\uff0c\u90a3\u4e48\u6211\u4eec\u53ef\u4ee5\u5c1d\u8bd5\u901a\u8fc7\u201c\u5f3a\u5236\u5408\u5e76\u201d\u7684\u65b9\u5f0f\u8fdb\u884c\u4fee\u590d\u3002<\/p>\n

git merge --abort\ngit merge --strategy-option=theirs branch-to-merge<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u9996\u5148\uff0c\u6211\u4eec\u4f7f\u7528\u201cgit merge –abort\u201d\u547d\u4ee4\u64a4\u6d88\u4e4b\u524d\u7684\u5408\u5e76\u64cd\u4f5c\uff0c\u7136\u540e\u4f7f\u7528\u201cgit merge –strategy-option=theirs branch-to-merge\u201d\u547d\u4ee4\u5f3a\u5236\u5c06\u8fdc\u7a0b\u5206\u652f\u8986\u76d6\u5230\u672c\u5730\u5206\u652f\u3002\u8fd9\u79cd\u89e3\u51b3\u65b9\u6cd5\u7684\u98ce\u9669\u5728\u4e8e\uff0c\u4f1a\u8986\u76d6\u5f53\u524d\u5206\u652f\u800c\u4e0d\u662f\u5408\u5e76\u5206\u652f\uff0c\u56e0\u6b64\u5e94\u8be5\u5728\u786e\u8ba4\u64cd\u4f5c\u65f6\u8c28\u614e\u884c\u4e8b\u3002<\/p>\n
2. \u56de\u6eda\u5408\u5e76<\/h2>\n
\u5982\u679c\u6211\u4eec\u5728\u5408\u5e76\u67d0\u4e2a\u5206\u652f\u65f6\uff0c\u786e\u4fe1\u5b83\u662f\u9519\u8bef\u7684\uff0c\u53ef\u4ee5\u4f7f\u7528\u201cgit reset\u201d\u547d\u4ee4\u6765\u64a4\u9500\u5408\u5e76\u64cd\u4f5c\u3002<\/p>\n
git reset --hard HEAD^\ngit push -f origin master<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u8fd9\u6761\u547d\u4ee4\u5c06\u4f7f\u7528HEAD^\u7248\u672c\u91cd\u7f6e\u5230\u4e0a\u4e00\u4e2a\u7248\u672c\uff0c\u5e76\u8986\u76d6\u8fdc\u7a0b\u5206\u652f\u3002\u8fd9\u79cd\u89e3\u51b3\u65b9\u6cd5\u7684\u98ce\u9669\u5728\u4e8e\uff0c\u5982\u679c\u5728\u56de\u6eda\u4e4b\u524d\u5df2\u7ecf\u63a8\u9001\u4e86\u5176\u4ed6\u66f4\u65b0\uff0c\u90a3\u4e48\u6211\u4eec\u5c06\u4f1a\u4e22\u5931\u8fd9\u4e9b\u66f4\u65b0\u3002<\/p>\n
3. \u6fc0\u6d3b\u5907\u4efd<\/h2>\n
Git\u901a\u8fc7\u201cstash\u201d\u547d\u4ee4\u63d0\u4f9b\u4e86\u4e00\u4e2a\u5907\u4efd\u673a\u5236\uff0c\u53ef\u4ee5\u5728\u8fdb\u884c\u5176\u4ed6\u64cd\u4f5c\u65f6\u4fdd\u7559\u5f53\u524d\u5de5\u4f5c\u533a\u7684\u5185\u5bb9\u3002\u5982\u679c\u6211\u4eec\u5728\u5408\u5e76\u64cd\u4f5c\u4e2d\u9047\u5230\u4e86\u95ee\u9898\uff0c\u53ef\u4ee5\u4f7f\u7528\u201cstash\u201d\u6765\u5907\u4efd\u6211\u4eec\u7684\u5de5\u4f5c\uff0c\u7136\u540e\u4fee\u590d\u5408\u5e76\u95ee\u9898\u540e\u8fd8\u539f\u5907\u4efd\u3002<\/p>\n
git stash\ngit merge branch-to-merge\ngit stash pop<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u8fd9\u5c06\u4f7f\u7528\u201cstash\u201d\u547d\u4ee4\u4fdd\u5b58\u5f53\u524d\u5206\u652f\u7684\u66f4\u6539\uff0c\u6267\u884c\u5408\u5e76\u64cd\u4f5c\u540e\uff0c\u518d\u4f7f\u7528\u201cstash pop\u201d\u547d\u4ee4\u8fd8\u539f\u5907\u4efd\u3002\u8fd9\u79cd\u89e3\u51b3\u65b9\u6cd5\u7684\u597d\u5904\u5728\u4e8e\uff0c\u5373\u4f7f\u53d1\u751f\u4e86\u9519\u8bef\uff0c\u5de5\u4f5c\u533a\u4e2d\u7684\u5185\u5bb9\u4e5f\u5f97\u4ee5\u4fdd\u7559\u3002<\/p>\n
4. \u64a4\u9500\u63d0\u4ea4<\/h2>\n
\u5982\u679c\u6211\u4eec\u5df2\u7ecf\u5c06\u9519\u8bef\u7684\u5408\u5e76\u63d0\u4ea4\u5230\u7248\u672c\u5e93\u4e2d\u4e86\uff0c\u90a3\u4e48\u53ef\u4ee5\u4f7f\u7528\u201cgit revert\u201d\u547d\u4ee4\u6765\u64a4\u9500\u63d0\u4ea4\u3002<\/p>\n
git revert -m 1 HEAD<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u6b64\u547d\u4ee4\u5c06\u4f7f\u7528HEAD\u7684\u63d0\u4ea4\u6d88\u606f\u64a4\u9500\u4e0a\u4e00\u4e2a\u63d0\u4ea4\uff0c\u4f7f\u7528\u201c-m 1\u201d\u9009\u9879\u8868\u660e\u6211\u4eec\u5e0c\u671b\u56de\u6eda\u5230\u5408\u5e76\u7684\u7236\u63d0\u4ea4\u3002\u8fd9\u79cd\u89e3\u51b3\u65b9\u6cd5\u7684\u597d\u5904\u5728\u4e8e\uff0c\u5373\u4f7f\u6211\u4eec\u5728\u64a4\u9500\u4e4b\u540e\u63a8\u9001\u4e86\u5176\u4ed6\u66f4\u65b0\uff0c\u5386\u53f2\u8bb0\u5f55\u4e2d\u4ecd\u7136\u4f1a\u4fdd\u7559\u6211\u4eec\u4e4b\u524d\u7684\u9519\u8bef\u63d0\u4ea4\u3002<\/p>\n
\u603b\u4e4b\uff0cGit\u5408\u5e76\u5931\u8d25\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528\u4e0a\u8ff0\u65b9\u6cd5\u8fdb\u884c\u9000\u56de\u4e0e\u4fee\u590d\u3002\u5bf9\u4e8e\u6bcf\u79cd\u65b9\u6cd5\uff0c\u6211\u4eec\u5e94\u8be5\u6839\u636e\u4e2a\u4eba\u9700\u6c42\u6765\u9009\u62e9\u6700\u9002\u5408\u7684\u65b9\u6cd5\uff0c\u5e76\u5728\u8fdb\u884c\u64cd\u4f5c\u4e4b\u524d\u5907\u4efd\u91cd\u8981\u6570\u636e\uff0c\u8c28\u614e\u884c\u4e8b\u3002<\/p>\n
\u4ee5\u4e0a\u5c31\u662fgit merge\u5931\u8d25\u600e\u4e48\u9000\u56de\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":"
git\u662f\u73b0\u5728\u6700\u6d41\u884c\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u4e4b\u4e00\uff0c\u867d\u7136\u5b83\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u7ba1\u7406\u4ee3\u7801\uff0c\u4f46\u6709\u65f6\u5019\u6211\u4eec\u53ef\u80fd\u4f1a\u9047\u5230\u5408\u5e76\uff08merge\uff09\u7684\u95ee\u9898\uff0c\u6bd4\u5982\u5408\u5e76\u5931\u8d25\u3002\u5982\u679cgit\u5408\u5e76\u5931\u8d25\uff0c\u6211\u4eec\u8be5\u600e\u4e48\u9000\u56de\u5462\uff1f\u672c\u6587\u5c06\u4ecb\u7ecd\u51e0\u79cd\u65b9\u6cd5\u3002 1. \u5f3a\u5236\u8986\u76d6\u5408\u5e76 \u5728\u5408\u5e76\u5206\u652f\u65f6\uff0c\u5982\u679c\u91c7\u7528\u4e86\u201c\u5408\u5e76\u51b2\u7a81\u201d\u7684\u65b9\u5f0f\uff0c\u4f46\u5408\u5e76\u5931\u8d25\u4e86\uff0c\u90a3\u4e48\u6211\u4eec\u53ef\u4ee5\u5c1d\u8bd5\u901a\u8fc7\u201c\u5f3a\u5236\u5408\u5e76\u201d\u7684\u65b9\u5f0f\u8fdb\u884c\u4fee\u590d\u3002 git merge –abort git merge –strategy-option=theirs branch-to-merge \u767b\u5f55\u540e\u590d\u5236 \u9996\u5148\uff0c\u6211\u4eec\u4f7f\u7528\u201cgit merge –abort\u201d\u547d\u4ee4\u64a4\u6d88\u4e4b\u524d\u7684\u5408\u5e76\u64cd\u4f5c\uff0c\u7136\u540e\u4f7f\u7528\u201cgit merge –strategy-option=theirs branch-to-merge\u201d\u547d\u4ee4\u5f3a\u5236\u5c06\u8fdc\u7a0b\u5206\u652f\u8986\u76d6\u5230\u672c\u5730\u5206\u652f\u3002\u8fd9\u79cd\u89e3\u51b3\u65b9\u6cd5\u7684\u98ce\u9669\u5728\u4e8e\uff0c\u4f1a\u8986\u76d6\u5f53\u524d\u5206\u652f\u800c\u4e0d\u662f\u5408\u5e76\u5206\u652f\uff0c\u56e0\u6b64\u5e94\u8be5\u5728\u786e\u8ba4\u64cd\u4f5c\u65f6\u8c28\u614e\u884c\u4e8b\u3002 2. \u56de\u6eda\u5408\u5e76 \u5982\u679c\u6211\u4eec\u5728\u5408\u5e76\u67d0\u4e2a\u5206\u652f\u65f6\uff0c\u786e\u4fe1\u5b83\u662f\u9519\u8bef\u7684\uff0c\u53ef\u4ee5\u4f7f\u7528\u201cgit reset\u201d\u547d\u4ee4\u6765\u64a4\u9500\u5408\u5e76\u64cd\u4f5c\u3002 git reset –hard HEAD^ git push -f origin master \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u6761\u547d\u4ee4\u5c06\u4f7f\u7528HEAD^\u7248\u672c\u91cd\u7f6e\u5230\u4e0a\u4e00\u4e2a\u7248\u672c\uff0c\u5e76\u8986\u76d6\u8fdc\u7a0b\u5206\u652f\u3002\u8fd9\u79cd\u89e3\u51b3\u65b9\u6cd5\u7684\u98ce\u9669\u5728\u4e8e\uff0c\u5982\u679c\u5728\u56de\u6eda\u4e4b\u524d\u5df2\u7ecf\u63a8\u9001\u4e86\u5176\u4ed6\u66f4\u65b0\uff0c\u90a3\u4e48\u6211\u4eec\u5c06\u4f1a\u4e22\u5931\u8fd9\u4e9b\u66f4\u65b0\u3002 3. \u6fc0\u6d3b\u5907\u4efd Git\u901a\u8fc7\u201cstash\u201d\u547d\u4ee4\u63d0\u4f9b\u4e86\u4e00\u4e2a\u5907\u4efd\u673a\u5236\uff0c\u53ef\u4ee5\u5728\u8fdb\u884c\u5176\u4ed6\u64cd\u4f5c\u65f6\u4fdd\u7559\u5f53\u524d\u5de5\u4f5c\u533a\u7684\u5185\u5bb9\u3002\u5982\u679c\u6211\u4eec\u5728\u5408\u5e76\u64cd\u4f5c\u4e2d\u9047\u5230\u4e86\u95ee\u9898\uff0c\u53ef\u4ee5\u4f7f\u7528\u201cstash\u201d\u6765\u5907\u4efd\u6211\u4eec\u7684\u5de5\u4f5c\uff0c\u7136\u540e\u4fee\u590d\u5408\u5e76\u95ee\u9898\u540e\u8fd8\u539f\u5907\u4efd\u3002 git stash git merge branch-to-merge git stash pop \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u5c06\u4f7f\u7528\u201cstash\u201d\u547d\u4ee4\u4fdd\u5b58\u5f53\u524d\u5206\u652f\u7684\u66f4\u6539\uff0c\u6267\u884c\u5408\u5e76\u64cd\u4f5c\u540e\uff0c\u518d\u4f7f\u7528\u201cstash pop\u201d\u547d\u4ee4\u8fd8\u539f\u5907\u4efd\u3002\u8fd9\u79cd\u89e3\u51b3\u65b9\u6cd5\u7684\u597d\u5904\u5728\u4e8e\uff0c\u5373\u4f7f\u53d1\u751f\u4e86\u9519\u8bef\uff0c\u5de5\u4f5c\u533a\u4e2d\u7684\u5185\u5bb9\u4e5f\u5f97\u4ee5\u4fdd\u7559\u3002 4. \u64a4\u9500\u63d0\u4ea4 \u5982\u679c\u6211\u4eec\u5df2\u7ecf\u5c06\u9519\u8bef\u7684\u5408\u5e76\u63d0\u4ea4\u5230\u7248\u672c\u5e93\u4e2d\u4e86\uff0c\u90a3\u4e48\u53ef\u4ee5\u4f7f\u7528\u201cgit revert\u201d\u547d\u4ee4\u6765\u64a4\u9500\u63d0\u4ea4\u3002 git revert -m 1 […]<\/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-20043","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20043","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=20043"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20043\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20043"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20043"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20043"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}