{"id":19109,"date":"2024-11-19T14:24:43","date_gmt":"2024-11-19T06:24:43","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19109\/"},"modified":"2024-11-19T14:24:43","modified_gmt":"2024-11-19T06:24:43","slug":"%e5%a6%82%e4%bd%95%e5%8f%96%e6%b6%88-git-merge-%e6%93%8d%e4%bd%9c","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19109\/","title":{"rendered":"\u5982\u4f55\u53d6\u6d88 git merge \u64cd\u4f5c"},"content":{"rendered":"<p>git \u662f\u5f53\u524d\u4e1a\u754c\u6700\u5e38\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u4e4b\u4e00\uff0cgit merge \u662f git \u4e2d\u6700\u5e38\u89c1\u7684\u64cd\u4f5c\u4e4b\u4e00\uff0c\u5b83\u53ef\u4ee5\u5c06\u4e24\u4e2a\u4e0d\u540c\u7684\u5206\u652f\u5408\u5e76\u5230\u4e00\u8d77\u3002\u4f46\u662f\uff0c\u6709\u65f6\u5019\u6211\u4eec\u5408\u5e76\u4e86\u4e00\u4e2a\u4e0d\u8be5\u5408\u5e76\u7684\u5206\u652f\u6216\u4ee3\u7801\uff0c\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u9700\u8981\u53d6\u6d88\u5408\u5e76\u3002\u90a3\u4e48\uff0c\u5982\u4f55\u53d6\u6d88 git merge \u64cd\u4f5c\u5462\uff1f\u672c\u6587\u5c06\u4e3a\u5927\u5bb6\u4ecb\u7ecd\u4e00\u4e9b\u89e3\u51b3\u529e\u6cd5\u3002<\/p>\n<p><strong><em>\u5982\u4f55\u67e5\u770b\u5408\u5e76\u60c5\u51b5<\/em><\/strong><\/p>\n<ol>\n<li>\u4f7f\u7528 git log \u547d\u4ee4<\/li>\n<\/ol>\n<p>\u9996\u5148\uff0c\u6211\u4eec\u9700\u8981\u4e86\u89e3\u5408\u5e76\u7684\u60c5\u51b5\u3002\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528 git log \u547d\u4ee4\u67e5\u770b\u76f8\u5173\u4fe1\u606f\u3002\u6267\u884c\u547d\u4ee4\uff1a<\/p>\n<pre>git log --graph --oneline --decorate<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8be5\u547d\u4ee4\u5c06\u5c55\u793a\u4e00\u4e2a\u6f02\u4eae\u7684\u63d0\u4ea4\u5386\u53f2\u53ef\u89c6\u5316\u56fe\uff0c\u5305\u62ec\u6240\u6709\u5206\u652f\u7684\u5408\u5e76\u548c\u63d0\u4ea4\u4fe1\u606f\u3002<\/p>\n<ol>\n<li>\u4f7f\u7528 git reflog \u547d\u4ee4<\/li>\n<\/ol>\n<p>Git reflog \u547d\u4ee4\u53ef\u4ee5\u5217\u51fa Git \u5f15\u7528\u7684\u4fee\u6539\u5386\u53f2\uff0c\u5305\u62ec commit\u3001merge\u3001rebase \u7b49\u3002\u6267\u884c\u547d\u4ee4\uff1a<\/p>\n<pre>git reflog<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8be5\u547d\u4ee4\u5c06\u5c55\u793a\u6240\u6709 git \u64cd\u4f5c\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u5305\u62ec git merge \u64cd\u4f5c\u3002\u8f93\u51fa\u5982\u4e0b\uff1a<\/p>\n<pre>cb61cbb HEAD@{0}: merge dev_branch: Fast-forward\na44ab51 HEAD@{1}: checkout: moving from dev_branch to master\ncb61cbb HEAD@{2}: merge dev_branch: Merge made by the 'recursive' strategy.\ne6c8ed6 HEAD@{3}: checkout: moving from master to dev_branch<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p><strong><em>\u53d6\u6d88\u5408\u5e76<\/em><\/strong><\/p>\n<ol>\n<li>\u4f7f\u7528 git reset \u547d\u4ee4<\/li>\n<\/ol>\n<p>\u5982\u679c\u6211\u4eec\u60f3\u8981\u5b8c\u5168\u53d6\u6d88 merge \u64cd\u4f5c\uff0c\u5e76\u4e14\u4e0d\u5e0c\u671b\u5bf9\u539f\u6709\u7684\u63d0\u4ea4\u5386\u53f2\u9020\u6210\u5f71\u54cd\uff0c\u53ef\u4ee5\u901a\u8fc7 git reset \u547d\u4ee4\u6765\u5b9e\u73b0\u3002\u6267\u884c\u547d\u4ee4\uff1a<\/p>\n<pre>git reset --hard HEAD^<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u4e0a\u8ff0\u547d\u4ee4\u4f1a\u5c06 HEAD \u6307\u9488\u5411\u540e\u9000\u4e00\u6b21\u63d0\u4ea4\uff0c\u5e76\u5220\u9664 merge \u64cd\u4f5c\u6240\u4ea7\u751f\u7684\u6240\u6709\u4ee3\u7801\u53d8\u5316\u3002\u6ce8\u610f\uff0c\u8fd9\u662f\u4e00\u79cd\u5371\u9669\u7684\u505a\u6cd5\uff0c\u4e00\u5b9a\u8981\u5c0f\u5fc3\u4f7f\u7528\u3002<\/p>\n<ol>\n<li>\u4f7f\u7528 git revert \u547d\u4ee4<\/li>\n<\/ol>\n<p>\u5982\u679c\u6211\u4eec\u60f3\u8981\u4fdd\u7559\u539f\u6709\u7684\u63d0\u4ea4\u5386\u53f2\uff0c\u5e76\u4e14\u64a4\u9500\u67d0\u4e2a merge \u64cd\u4f5c\u6240\u5e26\u6765\u7684\u5f71\u54cd\uff0c\u53ef\u4ee5\u4f7f\u7528 git revert \u547d\u4ee4\u3002\u6267\u884c\u547d\u4ee4\uff1a<\/p>\n<pre>git revert -m 1 &lt;merge commit sha&gt;<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u6ce8\u610f\uff0c\u8fd9\u91cc\u7684 -m 1 \u53c2\u6570\u662f\u6307\u4ec5\u64a4\u9500\u4e00\u4e2a\u7236 commit \u7684\u53d8\u5316\uff0c\u5982\u679c\u4e00\u4e2a merge commit \u5408\u5e76\u4e86\u591a\u4e2a\u7236 commit\uff0c\u6211\u4eec\u9700\u8981\u4f7f\u7528 -m 2\u3001-m 3 \u7b49\u53c2\u6570\uff0c\u5177\u4f53\u4f7f\u7528\u54ea\u4e2a\u53c2\u6570\u9700\u8981\u6839\u636e\u60c5\u51b5\u800c\u5b9a\u3002<\/p>\n<ol>\n<li>\u4f7f\u7528 git reset \u547d\u4ee4\u548c git push \u547d\u4ee4<\/li>\n<\/ol>\n<p>\u5982\u679c\u5df2\u7ecf\u5c06 merge \u64cd\u4f5c push \u5230\u4e86\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u6211\u4eec\u9700\u8981\u4f7f\u7528 git reset \u547d\u4ee4\u5c06\u672c\u5730\u4ed3\u5e93\u8fd8\u539f\u5230 merge \u64cd\u4f5c\u524d\u7684\u72b6\u6001\uff0c\u518d\u4f7f\u7528 git push -f \u547d\u4ee4\u5c06\u8fdc\u7a0b\u4ed3\u5e93\u5f3a\u5236\u56de\u9000\u5230\u76f8\u540c\u7684\u72b6\u6001\u3002\u8fd9\u91cc\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u8fd9\u79cd\u505a\u6cd5\u4f1a\u5220\u9664\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u7684\u6240\u6709\u4fee\u6539\uff0c\u5e76\u4e14\u53ef\u80fd\u5bfc\u81f4\u5176\u4ed6\u4eba\u7684\u4ee3\u7801\u51fa\u73b0\u95ee\u9898\uff0c\u56e0\u6b64\u9700\u8981\u975e\u5e38\u5c0f\u5fc3\u4f7f\u7528\u3002<\/p>\n<p>\u603b\u7ed3<\/p>\n<p>\u672c\u6587\u4ecb\u7ecd\u4e86\u5982\u4f55\u53d6\u6d88 git merge \u64cd\u4f5c\uff0c\u5305\u62ec\u901a\u8fc7 git reset \u547d\u4ee4\u3001git revert \u547d\u4ee4\u3001git reset \u547d\u4ee4\u548c git push \u547d\u4ee4\u7b49\u65b9\u5f0f\u3002\u5728\u4f7f\u7528\u8fd9\u4e9b\u547d\u4ee4\u65f6\uff0c\u4e00\u5b9a\u8981\u5c0f\u5fc3\u8c28\u614e\uff0c\u4ee5\u907f\u514d\u5bf9\u4ee3\u7801\u9020\u6210\u4e0d\u5fc5\u8981\u7684\u5f71\u54cd\u3002\u540c\u65f6\uff0c\u6211\u4eec\u8fd8\u4e86\u89e3\u4e86\u5982\u4f55\u67e5\u770b git merge \u64cd\u4f5c\u7684\u76f8\u5173\u4fe1\u606f\uff0c\u8fd9\u5bf9\u4e8e\u89e3\u51b3 git merge \u76f8\u5173\u95ee\u9898\u975e\u5e38\u6709\u5e2e\u52a9\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662f\u5982\u4f55\u53d6\u6d88 git merge \u64cd\u4f5c\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>git \u662f\u5f53\u524d\u4e1a\u754c\u6700\u5e38\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u4e4b\u4e00\uff0cgit merge \u662f git \u4e2d\u6700\u5e38\u89c1\u7684\u64cd\u4f5c\u4e4b\u4e00\uff0c\u5b83\u53ef\u4ee5\u5c06\u4e24\u4e2a\u4e0d\u540c\u7684\u5206\u652f\u5408\u5e76\u5230\u4e00\u8d77\u3002\u4f46\u662f\uff0c\u6709\u65f6\u5019\u6211\u4eec\u5408\u5e76\u4e86\u4e00\u4e2a\u4e0d\u8be5\u5408\u5e76\u7684\u5206\u652f\u6216\u4ee3\u7801\uff0c\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u9700\u8981\u53d6\u6d88\u5408\u5e76\u3002\u90a3\u4e48\uff0c\u5982\u4f55\u53d6\u6d88 git merge \u64cd\u4f5c\u5462\uff1f\u672c\u6587\u5c06\u4e3a\u5927\u5bb6\u4ecb\u7ecd\u4e00\u4e9b\u89e3\u51b3\u529e\u6cd5\u3002 \u5982\u4f55\u67e5\u770b\u5408\u5e76\u60c5\u51b5 \u4f7f\u7528 git log \u547d\u4ee4 \u9996\u5148\uff0c\u6211\u4eec\u9700\u8981\u4e86\u89e3\u5408\u5e76\u7684\u60c5\u51b5\u3002\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528 git log \u547d\u4ee4\u67e5\u770b\u76f8\u5173\u4fe1\u606f\u3002\u6267\u884c\u547d\u4ee4\uff1a git log &#8211;graph &#8211;oneline &#8211;decorate \u767b\u5f55\u540e\u590d\u5236 \u8be5\u547d\u4ee4\u5c06\u5c55\u793a\u4e00\u4e2a\u6f02\u4eae\u7684\u63d0\u4ea4\u5386\u53f2\u53ef\u89c6\u5316\u56fe\uff0c\u5305\u62ec\u6240\u6709\u5206\u652f\u7684\u5408\u5e76\u548c\u63d0\u4ea4\u4fe1\u606f\u3002 \u4f7f\u7528 git reflog \u547d\u4ee4 Git reflog \u547d\u4ee4\u53ef\u4ee5\u5217\u51fa Git \u5f15\u7528\u7684\u4fee\u6539\u5386\u53f2\uff0c\u5305\u62ec commit\u3001merge\u3001rebase \u7b49\u3002\u6267\u884c\u547d\u4ee4\uff1a git reflog \u767b\u5f55\u540e\u590d\u5236 \u8be5\u547d\u4ee4\u5c06\u5c55\u793a\u6240\u6709 git \u64cd\u4f5c\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u5305\u62ec git merge \u64cd\u4f5c\u3002\u8f93\u51fa\u5982\u4e0b\uff1a cb61cbb HEAD@{0}: merge dev_branch: Fast-forward a44ab51 HEAD@{1}: checkout: moving from [&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-19109","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19109","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=19109"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19109\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19109"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19109"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19109"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}