{"id":20380,"date":"2024-11-19T12:31:26","date_gmt":"2024-11-19T04:31:26","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20380\/"},"modified":"2024-11-19T12:31:26","modified_gmt":"2024-11-19T04:31:26","slug":"%e5%87%a0%e5%8d%81%e5%bc%a0%e5%8a%a8%e5%9b%be%e5%91%8a%e8%af%89%e4%bd%a0-git%e5%88%b0%e5%ba%95%e6%98%af%e6%80%8e%e4%b9%88%e7%8e%a9%e7%9a%84","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20380\/","title":{"rendered":"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684"},"content":{"rendered":"<p><span style=\"font-size: 15px;letter-spacing: 0.544px\"> merge\u3001git rebase\u3001git reset\u3001git revert\u3001git fetch\u3001git pull\u3001git reflog\u2026\u2026\u4f60\u77e5\u9053\u8fd9\u4e9b git \u547d\u4ee4\u6267\u884c\u7684\u7a76\u7adf\u662f\u4ec0\u4e48\u4efb\u52a1\u5417\uff1f\u5982\u679c\u4f60\u8fd8\u6709\u4e9b\u5206\u4e0d\u6e05\u695a\uff0c\u90a3\u5343\u4e07\u4e0d\u80fd\u9519\u8fc7\u8fd9\u7bc7\u6587\u7ae0\u3002\u5728\u672c\u6587\u4e2d\uff0c\u719f\u77e5 JavaScript\u3001TypeScript\u3001GraphQL\u3001Serverless\u3001AWS\u3001Docker \u548c Golang \u7684 21 \u5c81\u5e74\u8f7b\u8f6f\u4ef6\u987e\u95ee Lydia Hallie \u901a\u8fc7\u52a8\u56fe\u5f62\u5f0f\u76f4\u89c2\u5730\u4ecb\u7ecd\u4e86\u8fd9\u4e9b\u5e38\u7528 git \u547d\u4ee4\u7684\u5de5\u4f5c\u8fc7\u7a0b\uff0c\u5305\u4f60\u8fc7\u76ee\u4e0d\u5fd8\u3002<\/span> <\/p>\n<p><span style=\"max-width: 100%;font-size: 15px\">\u5c3d\u7ba1 Git \u662f\u4e00\u6b3e\u975e\u5e38\u5f3a\u5927\u7684\u5de5\u5177\uff0c\u4f46\u5982\u679c\u6211\u8bf4 Git \u7528\u8d77\u6765\u7b80\u76f4\u662f\u5669\u68a6\uff0c\u5927\u591a\u6570\u4eba\u4e5f\u4f1a\u8ba4\u540c\u6211\u7684\u8bf4\u6cd5\u3002\u6211\u53d1\u73b0\u5728\u4f7f\u7528 Git \u65f6\uff0c\u5728\u5934\u8111\u91cc\u53ef\u89c6\u5316\u5730\u60f3\u8c61\u5b83\u4f1a\u975e\u5e38\u6709\u7528\uff1a\u5f53\u6211\u6267\u884c\u4e00\u4e2a\u7279\u5b9a\u547d\u4ee4\u65f6\uff0c\u8fd9\u4e9b\u5206\u652f\u4f1a\u5982\u4f55\u4ea4\u4e92\uff0c\u53c8\u4f1a\u600e\u6837\u5f71\u54cd\u5386\u53f2\u8bb0\u5f55\uff1f\u4e3a\u4ec0\u4e48\u5f53\u6211\u5728 master \u4e0a\u6267\u884c\u786c\u91cd\u542f\uff0cforce push \u5230\u539f\u5206\u652f\u4ee5\u53ca rimraf \u6211\u4eec\u7684 .git \u6587\u4ef6\u5939\u65f6\uff0c\u6211\u7684\u540c\u4e8b\u54ed\u4e86\uff1f<\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u6211\u89c9\u5f97\u521b\u5efa\u4e00\u4e9b\u6700\u5e38\u7528\u4e14\u6700\u6709\u7528\u7684 Git \u547d\u4ee4\u7684\u53ef\u89c6\u5316\u793a\u4f8b\u4f1a\u662f\u4e00\u4e2a\u5b8c\u7f8e\u7684\u7528\u4f8b\uff01\u4e0b\u9762\u6211\u5c06\u4ecb\u7ecd\u7684\u5f88\u591a\u547d\u4ee4\u90fd\u6709\u53ef\u9009\u53c2\u6570\u2014\u2014\u4f60\u53ef\u4ee5\u4f7f\u7528\u8fd9\u4e9b\u53c2\u6570\u6765\u6539\u53d8\u5bf9\u5e94\u547d\u4ee4\u7684\u884c\u4e3a\u3002\u800c\u6211\u7684\u793a\u4f8b\u53ea\u4f1a\u6db5\u76d6\u547d\u4ee4\u7684\u9ed8\u8ba4\u884c\u4e3a\uff0c\u800c\u4e0d\u4f1a\u6dfb\u52a0\uff08\u6216\u6dfb\u52a0\u592a\u591a\uff09\u53ef\u9009\u914d\u7f6e\uff01<\/span><br \/>\n<br \/> <br \/>\n<span style=\"font-size: 15px\"><strong><span style=\"max-width: 100%\">\u5408\u5e76<\/span><\/strong><\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u62e5\u6709\u591a\u4e2a\u5206\u652f\u662f\u5f88\u65b9\u4fbf\u7684\uff0c\u8fd9\u6837\u53ef\u4ee5\u5c06\u4e0d\u540c\u7684\u65b0\u4fee\u6539\u4e92\u76f8\u9694\u79bb\u5f00\uff0c\u800c\u4e14\u8fd8\u80fd\u786e\u4fdd\u4f60\u4e0d\u4f1a\u610f\u5916\u5730\u5411\u751f\u4ea7\u4ee3\u7801\u63a8\u9001\u672a\u7ecf\u8bb8\u53ef\u6216\u7834\u635f\u7684\u4ee3\u7801\u4fee\u6539\u3002\u4f46\u4e00\u65e6\u8fd9\u4e9b\u4fee\u6539\u5f97\u5230\u4e86\u6279\u51c6\u8bb8\u53ef\uff0c\u6211\u4eec\u5c31\u9700\u8981\u5c06\u5176\u90e8\u7f72\u5230\u6211\u4eec\u7684\u751f\u4ea7\u5206\u652f\u4e2d\uff01<\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u53ef\u5c06\u4e00\u4e2a\u5206\u652f\u7684\u4fee\u6539\u878d\u5165\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u7684\u4e00\u79cd\u65b9\u5f0f\u662f\u6267\u884c git merge\u3002Git \u53ef\u6267\u884c\u4e24\u79cd\u7c7b\u578b\u7684\u5408\u5e76\uff1afast-forward \u548c no-fast-forward\u3002\u73b0\u5728\u4f60\u53ef\u80fd\u5206\u4e0d\u6e05\uff0c\u4f46\u6211\u4eec\u9a6c\u4e0a\u5c31\u6765\u770b\u770b\u5b83\u4eec\u7684\u5dee\u5f02\u6240\u5728\u3002<\/span><br \/>\n<br \/> <br \/>\n<span><strong><span style=\"max-width: 100%;font-size: 15px\">Fast-forward (\u2014ff)<\/span><\/strong><\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5728\u5f53\u524d\u5206\u652f\u76f8\u6bd4\u4e8e\u6211\u4eec\u8981\u5408\u5e76\u7684\u5206\u652f\u6ca1\u6709\u989d\u5916\u7684\u63d0\u4ea4\uff08commit\uff09\u65f6\uff0c\u53ef\u4ee5\u6267\u884c fast-forward \u5408\u5e76\u3002Git \u5f88\u61d2\uff0c\u9996\u5148\u4f1a\u5c1d\u8bd5\u6267\u884c\u6700\u7b80\u5355\u7684\u9009\u9879\uff1afast-forward\uff01\u8fd9\u7c7b\u5408\u5e76\u4e0d\u4f1a\u521b\u5efa\u65b0\u7684\u63d0\u4ea4\uff0c\u800c\u662f\u4f1a\u5c06\u6211\u4eec\u6b63\u5728\u5408\u5e76\u7684\u5206\u652f\u4e0a\u7684\u63d0\u4ea4\u76f4\u63a5\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u3002<\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/2031b6b4fb9a93d0eb079f543da486d7-2.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe\" \/><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5b8c\u7f8e\uff01\u73b0\u5728\uff0c\u6211\u4eec\u5728 dev \u5206\u652f\u4e0a\u6240\u505a\u7684\u6240\u6709\u6539\u53d8\u90fd\u5408\u5e76\u5230\u4e86 master \u5206\u652f\u4e0a\u3002\u90a3\u4e48 no-fast-forward \u53c8\u662f\u4ec0\u4e48\u610f\u601d\u5462\uff1f<\/span><br \/>\n<br \/> <br \/>\n<span><strong><span style=\"max-width: 100%;font-size: 15px\">No-fast-foward (\u2014no-ff)<\/span><\/strong><\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5982\u679c\u4f60\u7684\u5f53\u524d\u5206\u652f\u76f8\u6bd4\u4e8e\u4f60\u60f3\u8981\u5408\u5e76\u7684\u5206\u652f\u6ca1\u6709\u4efb\u4f55\u63d0\u4ea4\uff0c\u90a3\u5f53\u7136\u5f88\u597d\uff0c\u4f46\u5f88\u9057\u61be\u73b0\u5b9e\u60c5\u51b5\u5f88\u5c11\u5982\u6b64\uff01\u5982\u679c\u6211\u4eec\u5728\u5f53\u524d\u5206\u652f\u4e0a\u63d0\u4ea4\u6211\u4eec\u60f3\u8981\u5408\u5e76\u7684\u5206\u652f\u4e0d\u5177\u5907\u7684\u6539\u53d8\uff0c\u90a3\u4e48 git \u5c06\u4f1a\u6267\u884c no-fast-forward \u5408\u5e76\u3002<\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u4f7f\u7528 no-fast-forward \u5408\u5e76\u65f6\uff0cGit \u4f1a\u5728\u5f53\u524d\u6d3b\u52a8\u5206\u652f\u4e0a\u521b\u5efa\u65b0\u7684 merging commit\u3002\u8fd9\u4e2a\u63d0\u4ea4\u7684\u7236\u63d0\u4ea4\uff08parent commit\uff09\u5373\u6307\u5411\u8fd9\u4e2a\u6d3b\u52a8\u5206\u652f\uff0c\u4e5f\u6307\u5411\u6211\u4eec\u60f3\u8981\u5408\u5e76\u7684\u5206\u652f\uff01<\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/fa3a2b63046825a3c17c25cb8dc92ef8-3.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe1\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe1\" \/><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u6ca1\u4ec0\u4e48\u5927\u4e0d\u4e86\u7684\uff0c\u5b8c\u7f8e\u7684\u5408\u5e76\uff01\u73b0\u5728\uff0c\u6211\u4eec\u5728 dev \u5206\u652f\u4e0a\u6240\u505a\u7684\u6240\u6709\u6539\u53d8\u90fd\u5408\u5e76\u5230\u4e86 master \u5206\u652f\u4e0a\u3002<\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><strong>\u5408\u5e76\u51b2\u7a81<\/strong><\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5c3d\u7ba1 Git \u80fd\u591f\u5f88\u597d\u5730\u51b3\u5b9a\u5982\u4f55\u5408\u5e76\u5206\u652f\u4ee5\u53ca\u5982\u4f55\u5411\u6587\u4ef6\u6dfb\u52a0\u4fee\u6539\uff0c\u4f46\u5b83\u5e76\u4e0d\u603b\u662f\u80fd\u5b8c\u5168\u81ea\u5df1\u505a\u51b3\u5b9a\u3002\u5f53\u6211\u4eec\u60f3\u8981\u5408\u5e76\u7684\u4e24\u4e2a\u5206\u652f\u7684\u540c\u4e00\u6587\u4ef6\u4e2d\u7684\u540c\u4e00\u884c\u4ee3\u7801\u4e0a\u6709\u4e0d\u540c\u7684\u4fee\u6539\uff0c\u6216\u8005\u4e00\u4e2a\u5206\u652f\u5220\u9664\u4e86\u4e00\u4e2a\u6587\u4ef6\u800c\u53e6\u4e00\u4e2a\u5206\u652f\u4fee\u6539\u4e86\u8fd9\u4e2a\u6587\u4ef6\u65f6\uff0cGit \u5c31\u4e0d\u77e5\u9053\u5982\u4f55\u53d6\u820d\u4e86\u3002<\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5728\u8fd9\u6837\u7684\u60c5\u51b5\u4e0b\uff0cGit \u4f1a\u8be2\u95ee\u4f60\u60f3\u8981\u4fdd\u7559\u54ea\u79cd\u9009\u62e9\uff1f\u5047\u8bbe\u5728\u8fd9\u4e24\u4e2a\u5206\u652f\u4e2d\uff0c\u6211\u4eec\u90fd\u7f16\u8f91\u4e86 README.md \u7684\u7b2c\u4e00\u884c\u3002<\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/fa3a2b63046825a3c17c25cb8dc92ef8-4.png\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe2\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe2\" \/> <\/p>\n<p><span style=\"max-width: 100%;font-size: 15px\">\u5982\u679c\u6211\u4eec\u60f3\u628a dev \u5408\u5e76\u5230 master\uff0c\u5c31\u4f1a\u51fa\u73b0\u4e00\u4e2a\u5408\u5e76\u51b2\u7a81\uff1a\u4f60\u60f3\u8981\u6807\u9898\u662f Hello! \u8fd8\u662f Hey!\uff1f<\/p>\n<p>\u5f53\u5c1d\u8bd5\u5408\u5e76\u8fd9\u4e9b\u5206\u652f\u65f6\uff0cGit \u4f1a\u5411\u4f60\u5c55\u793a\u51b2\u7a81\u51fa\u73b0\u7684\u4f4d\u7f6e\u3002\u6211\u4eec\u53ef\u4ee5\u624b\u52a8\u79fb\u9664\u6211\u4eec\u4e0d\u60f3\u4fdd\u7559\u7684\u4fee\u6539\uff0c\u4fdd\u5b58\u8fd9\u4e9b\u4fee\u6539\uff0c\u518d\u6b21\u6dfb\u52a0\u8fd9\u4e2a\u5df2\u4fee\u6539\u7684\u6587\u4ef6\uff0c\u7136\u540e\u63d0\u4ea4\u8fd9\u4e9b\u4fee\u6539\u3002<\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/fa3a2b63046825a3c17c25cb8dc92ef8-5.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe3\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe3\" \/><br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5b8c\u6210\uff01\u5c3d\u7ba1\u5408\u5e76\u51b2\u7a81\u5f80\u5f80\u5f88\u8ba9\u4eba\u538c\u70e6\uff0c\u4f46\u8fd9\u662f\u5408\u7406\u7684\uff1aGit \u4e0d\u5e94\u8be5\u778e\u731c\u6211\u4eec\u60f3\u8981\u4fdd\u7559\u54ea\u4e9b\u4fee\u6539\u3002<\/span> <\/p>\n<p><span style=\"font-size: 15px\"><strong><span style=\"max-width: 100%\">\u53d8\u57fa\uff08Rebasing\uff09<\/span><\/strong><\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u6211\u4eec\u521a\u770b\u5230\u53ef\u901a\u8fc7\u6267\u884c git merge \u5c06\u4e00\u4e2a\u5206\u652f\u7684\u4fee\u6539\u5e94\u7528\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u3002\u53e6\u4e00\u79cd\u53ef\u5c06\u4e00\u4e2a\u5206\u652f\u7684\u4fee\u6539\u878d\u5165\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u7684\u65b9\u5f0f\u662f\u6267\u884c git rebase\u3002<\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">git rebase \u4f1a\u5c06\u5f53\u524d\u5206\u652f\u7684\u63d0\u4ea4\u590d\u5236\u5230\u6307\u5b9a\u7684\u5206\u652f\u4e4b\u4e0a\u3002<\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/c5587670b3ac9b0b191e627eaa17aa3f-6.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe4\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe4\" \/> <\/p>\n<p><span style=\"max-width: 100%;font-size: 15px\">\u5b8c\u7f8e\uff0c\u73b0\u5728\u6211\u4eec\u5728 dev \u5206\u652f\u4e0a\u83b7\u53d6\u4e86 master \u5206\u652f\u4e0a\u7684\u6240\u6709\u4fee\u6539\u3002<\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u53d8\u57fa\u4e0e\u5408\u5e76\u6709\u4e00\u4e2a\u91cd\u5927\u7684\u533a\u522b\uff1aGit \u4e0d\u4f1a\u5c1d\u8bd5\u786e\u5b9a\u8981\u4fdd\u7559\u6216\u4e0d\u4fdd\u7559\u54ea\u4e9b\u6587\u4ef6\u3002\u6211\u4eec\u6267\u884c rebase \u7684\u5206\u652f\u603b\u662f\u542b\u6709\u6211\u4eec\u60f3\u8981\u4fdd\u7559\u7684\u6700\u65b0\u8fd1\u7684\u4fee\u6539\uff01\u8fd9\u6837\u6211\u4eec\u4e0d\u4f1a\u9047\u5230\u4efb\u4f55\u5408\u5e76\u51b2\u7a81\uff0c\u800c\u4e14\u53ef\u4ee5\u4fdd\u7559\u4e00\u4e2a\u6f02\u4eae\u7684\u3001\u7ebf\u6027\u7684 Git \u5386\u53f2\u8bb0\u5f55\u3002<\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u4e0a\u9762\u8fd9\u4e2a\u4f8b\u5b50\u5c55\u793a\u4e86\u5728 master \u5206\u652f\u4e0a\u7684\u53d8\u57fa\u3002\u4f46\u662f\uff0c\u5728\u66f4\u5927\u578b\u7684\u9879\u76ee\u4e2d\uff0c\u4f60\u901a\u5e38\u4e0d\u9700\u8981\u8fd9\u6837\u7684\u64cd\u4f5c\u3002git rebase \u5728\u4e3a\u590d\u5236\u7684\u63d0\u4ea4\u521b\u5efa\u65b0\u7684 hash \u65f6\u4f1a\u4fee\u6539\u9879\u76ee\u7684\u5386\u53f2\u8bb0\u5f55\u3002<\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5982\u679c\u4f60\u5728\u5f00\u53d1\u4e00\u4e2a feature \u5206\u652f\u5e76\u4e14 master \u5206\u652f\u5df2\u7ecf\u66f4\u65b0\u8fc7\uff0c\u90a3\u4e48\u53d8\u57fa\u5c31\u5f88\u597d\u7528\u3002\u4f60\u53ef\u4ee5\u5728\u4f60\u7684\u5206\u652f\u4e0a\u83b7\u53d6\u6240\u6709\u66f4\u65b0\uff0c\u8fd9\u80fd\u9632\u6b62\u672a\u6765\u51fa\u73b0\u5408\u5e76\u51b2\u7a81\u3002<\/span><br \/>\n<br \/> <br \/>\n<span style=\"font-size: 15px\"><strong><span style=\"max-width: 100%\">\u4ea4\u4e92\u5f0f\u53d8\u57fa\uff08Interactive Rebase\uff09<\/span><\/strong><\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5728\u4e3a\u63d0\u4ea4\u6267\u884c\u53d8\u57fa\u4e4b\u524d\uff0c\u6211\u4eec\u53ef\u4ee5\u4fee\u6539\u5b83\u4eec\uff01\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ea4\u4e92\u5f0f\u53d8\u57fa\u6765\u5b8c\u6210\u8fd9\u4e00\u4efb\u52a1\u3002\u4ea4\u4e92\u5f0f\u53d8\u57fa\u5728\u4f60\u5f53\u524d\u5f00\u53d1\u7684\u5206\u652f\u4e0a\u4ee5\u53ca\u60f3\u8981\u4fee\u6539\u67d0\u4e9b\u63d0\u4ea4\u65f6\u4f1a\u5f88\u6709\u7528\u3002<\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><br \/>\u5728\u6211\u4eec\u6b63\u5728 rebase \u7684\u63d0\u4ea4\u4e0a\uff0c\u6211\u4eec\u53ef\u4ee5\u6267\u884c\u4ee5\u4e0b 6 \u4e2a\u52a8\u4f5c\uff1a<\/span> <\/p>\n<ul>\n<li>\n<p style=\"max-width: 100%;min-height: 1em;line-height: 1.75em\"><span style=\"max-width: 100%;font-size: 15px\">reword\uff1a\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\uff1b<\/span><\/p>\n<\/li>\n<li>\n<p style=\"max-width: 100%;min-height: 1em;line-height: 1.75em\"><span style=\"max-width: 100%;font-size: 15px\">edit\uff1a\u4fee\u6539\u6b64\u63d0\u4ea4\uff1b<\/span><\/p>\n<\/li>\n<li>\n<p style=\"max-width: 100%;min-height: 1em;line-height: 1.75em\"><span style=\"max-width: 100%;font-size: 15px\">squash\uff1a\u5c06\u63d0\u4ea4\u878d\u5408\u5230\u524d\u4e00\u4e2a\u63d0\u4ea4\u4e2d\uff1b<\/span><\/p>\n<\/li>\n<li>\n<p style=\"max-width: 100%;min-height: 1em;line-height: 1.75em\"><span style=\"max-width: 100%;font-size: 15px\">fixup\uff1a\u5c06\u63d0\u4ea4\u878d\u5408\u5230\u524d\u4e00\u4e2a\u63d0\u4ea4\u4e2d\uff0c\u4e0d\u4fdd\u7559\u8be5\u63d0\u4ea4\u7684\u65e5\u5fd7\u6d88\u606f\uff1b<\/span><\/p>\n<\/li>\n<li>\n<p style=\"max-width: 100%;min-height: 1em;line-height: 1.75em\"><span style=\"max-width: 100%;font-size: 15px\">exec\uff1a\u5728\u6bcf\u4e2a\u63d0\u4ea4\u4e0a\u8fd0\u884c\u6211\u4eec\u60f3\u8981 rebase \u7684\u547d\u4ee4\uff1b<\/span><\/p>\n<\/li>\n<li>\n<p style=\"max-width: 100%;min-height: 1em;line-height: 1.75em\"><span style=\"max-width: 100%;font-size: 15px\">drop\uff1a\u79fb\u9664\u8be5\u63d0\u4ea4\u3002<\/span><\/p>\n<\/li>\n<\/ul>\n<p> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5f88\u68d2\uff01\u8fd9\u6837\u6211\u4eec\u5c31\u80fd\u5b8c\u5168\u63a7\u5236\u6211\u4eec\u7684\u63d0\u4ea4\u4e86\u3002\u5982\u679c\u4f60\u60f3\u8981\u79fb\u9664\u4e00\u4e2a\u63d0\u4ea4\uff0c\u53ea\u9700 drop \u5373\u53ef\u3002<br \/><\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/c5587670b3ac9b0b191e627eaa17aa3f-7.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe5\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe5\" \/><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5982\u679c\u4f60\u60f3\u628a\u591a\u4e2a\u63d0\u4ea4\u878d\u5408\u5230\u4e00\u8d77\u4ee5\u4fbf\u5f97\u5230\u6e05\u6670\u7684\u63d0\u4ea4\u5386\u53f2\uff0c\u90a3\u4e5f\u6ca1\u6709\u95ee\u9898\uff01<br \/><\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/9e5742eb12549ad2a4d15299b74d9abe-8.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe6\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe6\" \/><br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u4ea4\u4e92\u5f0f\u53d8\u57fa\u80fd\u4e3a\u4f60\u5728 rebase \u65f6\u63d0\u4f9b\u5927\u91cf\u63a7\u5236\uff0c\u751a\u81f3\u53ef\u4ee5\u63a7\u5236\u5f53\u524d\u7684\u6d3b\u52a8\u5206\u652f\u3002<\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><br \/><\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><strong>\u91cd\u7f6e\uff08Resetting\uff09<\/strong><\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><br \/>\u5f53\u6211\u4eec\u4e0d\u60f3\u8981\u4e4b\u524d\u63d0\u4ea4\u7684\u4fee\u6539\u65f6\uff0c\u5c31\u4f1a\u7528\u5230\u8fd9\u4e2a\u547d\u4ee4\u3002\u4e5f\u8bb8\u8fd9\u662f\u4e00\u4e2a WIP \u63d0\u4ea4\u6216\u8005\u53ef\u80fd\u662f\u5f15\u5165\u4e86 bug \u7684\u63d0\u4ea4\uff0c\u8fd9\u65f6\u5019\u5c31\u8981\u6267\u884c git reset\u3002<\/p>\n<p>git reset \u80fd\u8ba9\u6211\u4eec\u4e0d\u518d\u4f7f\u7528\u5f53\u524d\u53f0\u9762\u4e0a\u7684\u6587\u4ef6\uff0c\u8ba9\u6211\u4eec\u53ef\u4ee5\u63a7\u5236 HEAD \u5e94\u8be5\u6307\u5411\u7684\u4f4d\u7f6e\u3002<\/p>\n<p><\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><strong>\u8f6f\u91cd\u7f6e<\/strong><\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><\/p>\n<p>\u8f6f\u91cd\u7f6e\u4f1a\u5c06 HEAD \u79fb\u81f3\u6307\u5b9a\u7684\u63d0\u4ea4\uff08\u6216\u4e0e HEAD \u76f8\u6bd4\u7684\u63d0\u4ea4\u7684\u7d22\u5f15\uff09\uff0c\u800c\u4e0d\u4f1a\u79fb\u9664\u8be5\u63d0\u4ea4\u4e4b\u540e\u52a0\u5165\u7684\u4fee\u6539\uff01<\/p>\n<p>\u5047\u8bbe\u6211\u4eec\u4e0d\u60f3\u4fdd\u7559\u6dfb\u52a0\u4e86\u4e00\u4e2a style.css \u6587\u4ef6\u7684\u63d0\u4ea4 9e78i\uff0c\u800c\u4e14\u6211\u4eec\u4e5f\u4e0d\u60f3\u4fdd\u7559\u6dfb\u52a0\u4e86\u4e00\u4e2a index.js \u6587\u4ef6\u7684\u63d0\u4ea4 035cc\u3002\u4f46\u662f\uff0c\u6211\u4eec\u786e\u5b9e\u53c8\u60f3\u8981\u4fdd\u7559\u65b0\u6dfb\u52a0\u7684 style.css \u548c index.js \u6587\u4ef6\uff01\u8fd9\u662f\u8f6f\u91cd\u7f6e\u7684\u4e00\u4e2a\u5b8c\u7f8e\u7528\u4f8b\u3002<br \/><\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/962558eda88e641cc50f32fd0468e515-9.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe7\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe7\" \/><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u8f93\u5165 git status \u540e\uff0c\u4f60\u4f1a\u770b\u5230\u6211\u4eec\u4ecd\u7136\u53ef\u4ee5\u8bbf\u95ee\u5728\u4e4b\u524d\u7684\u63d0\u4ea4\u4e0a\u505a\u8fc7\u7684\u6240\u6709\u4fee\u6539\u3002\u8fd9\u5f88\u597d\uff0c\u8fd9\u610f\u5473\u7740\u6211\u4eec\u53ef\u4ee5\u4fee\u590d\u8fd9\u4e9b\u6587\u4ef6\u7684\u5185\u5bb9\uff0c\u4e4b\u540e\u518d\u91cd\u65b0\u63d0\u4ea4\u5b83\u4eec\uff01<\/span> <\/p>\n<p><span style=\"max-width: 100%;font-size: 15px\"><strong>\u786c\u91cd\u7f6e<\/strong><\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><\/p>\n<p>\u6709\u65f6\u5019\u6211\u4eec\u5e76\u4e0d\u60f3\u4fdd\u7559\u7279\u5b9a\u63d0\u4ea4\u5f15\u5165\u7684\u4fee\u6539\u3002\u4e0d\u540c\u4e8e\u8f6f\u91cd\u7f6e\uff0c\u6211\u4eec\u5e94\u8be5\u518d\u4e5f\u65e0\u9700\u8bbf\u95ee\u5b83\u4eec\u3002Git \u5e94\u8be5\u76f4\u63a5\u5c06\u6574\u4f53\u72b6\u6001\u76f4\u63a5\u91cd\u7f6e\u5230\u7279\u5b9a\u63d0\u4ea4\u4e4b\u524d\u7684\u72b6\u6001\uff1a\u8fd9\u751a\u81f3\u5305\u62ec\u4f60\u5728\u5de5\u4f5c\u76ee\u5f55\u4e2d\u548c\u6682\u5b58\u6587\u4ef6\u4e0a\u7684\u4fee\u6539\u3002<br \/><\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/962558eda88e641cc50f32fd0468e515-10.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe8\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe8\" \/><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">Git \u4e22\u5f03\u4e86 9e78i \u548c 035cc \u5f15\u5165\u7684\u4fee\u6539\uff0c\u5e76\u5c06\u72b6\u6001\u91cd\u7f6e\u5230\u4e86 ec5be \u7684\u72b6\u6001\u3002<\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><br \/><\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><strong>\u8fd8\u539f\uff08Reverting\uff09<\/strong><\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u53e6\u4e00\u79cd\u64a4\u9500\u4fee\u6539\u7684\u65b9\u6cd5\u662f\u6267\u884c git revert\u3002\u901a\u8fc7\u5bf9\u7279\u5b9a\u7684\u63d0\u4ea4\u6267\u884c\u8fd8\u539f\u64cd\u4f5c\uff0c\u6211\u4eec\u4f1a\u521b\u5efa\u4e00\u4e2a\u5305\u542b\u5df2\u8fd8\u539f\u4fee\u6539\u7684\u65b0\u63d0\u4ea4\u3002<\/p>\n<p>\u5047\u8bbe ec5be \u6dfb\u52a0\u4e86\u4e00\u4e2a index.js \u6587\u4ef6\u3002\u4f46\u4e4b\u540e\u6211\u4eec\u53d1\u73b0\u5176\u5b9e\u6211\u4eec\u518d\u4e5f\u4e0d\u9700\u8981\u7531\u8fd9\u4e2a\u63d0\u4ea4\u5f15\u5165\u7684\u4fee\u6539\u4e86\u3002\u90a3\u5c31\u8fd8\u539f ec5be \u63d0\u4ea4\u5427\uff01<br \/><\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/962558eda88e641cc50f32fd0468e515-11.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe9\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe9\" \/><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5b8c\u7f8e\uff01\u63d0\u4ea4 9e78i \u8fd8\u539f\u4e86\u7531\u63d0\u4ea4 ec5be \u5f15\u5165\u7684\u4fee\u6539\u3002\u5728\u64a4\u9500\u7279\u5b9a\u7684\u63d0\u4ea4\u65f6\uff0cgit revert \u975e\u5e38\u6709\u7528\uff0c\u540c\u65f6\u4e5f\u4e0d\u4f1a\u4fee\u6539\u5206\u652f\u7684\u5386\u53f2\u3002<\/span><br \/>\n<br \/> <br \/>\n<span style=\"font-size: 15px\"><strong><span style=\"max-width: 100%\">\u62e3\u9009\uff08Cherry-picking\uff09<\/span><\/strong><\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5f53\u4e00\u4e2a\u7279\u5b9a\u5206\u652f\u5305\u542b\u6211\u4eec\u7684\u6d3b\u52a8\u5206\u652f\u9700\u8981\u7684\u67d0\u4e2a\u63d0\u4ea4\u65f6\uff0c\u6211\u4eec\u5bf9\u90a3\u4e2a\u63d0\u4ea4\u6267\u884c cherry-pick\uff01\u5bf9\u4e00\u4e2a\u63d0\u4ea4\u6267\u884c cherry-pick \u65f6\uff0c\u6211\u4eec\u4f1a\u5728\u6d3b\u52a8\u5206\u652f\u4e0a\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\uff0c\u5176\u4e2d\u5305\u542b\u7531\u62e3\u9009\u51fa\u6765\u7684\u63d0\u4ea4\u6240\u5f15\u5165\u7684\u4fee\u6539\u3002<\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5047\u8bbe dev \u5206\u652f\u4e0a\u7684\u63d0\u4ea4 76d12 \u4e3a index.js \u6587\u4ef6\u6dfb\u52a0\u4e86\u4e00\u9879\u4fee\u6539\uff0c\u800c\u6211\u4eec\u5e0c\u671b\u5c06\u5176\u6574\u5408\u5230 master \u5206\u652f\u4e2d\u3002\u6211\u4eec\u5e76\u4e0d\u60f3\u8981\u6574\u4e2a dev \u5206\u652f\uff0c\u800c\u53ea\u9700\u8981\u8fd9\u4e2a\u63d0\u4ea4\uff01<\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/d8ad65845a83f991b53f56faec1deebe-12.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe10\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe10\" \/><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u73b0\u5728 master \u5206\u652f\u5305\u542b 76d12 \u5f15\u5165\u7684\u4fee\u6539\u4e86\u3002<br \/><\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><br \/><\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><strong>\u53d6\u56de\uff08Fetching\uff09<\/strong><\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5982\u679c\u4f60\u6709\u4e00\u4e2a\u8fdc\u7a0b Git \u5206\u652f\uff0c\u6bd4\u5982\u5728 GitHub \u4e0a\u7684\u5206\u652f\uff0c\u5f53\u8fdc\u7a0b\u5206\u652f\u4e0a\u5305\u542b\u5f53\u524d\u5206\u652f\u6ca1\u6709\u7684\u63d0\u4ea4\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528\u53d6\u56de\u3002\u6bd4\u5982\u5f53\u5408\u5e76\u4e86\u53e6\u4e00\u4e2a\u5206\u652f\u6216\u4f60\u7684\u540c\u4e8b\u63a8\u9001\u4e86\u4e00\u4e2a\u5feb\u901f\u4fee\u590d\u65f6\u3002<\/p>\n<p>\u901a\u8fc7\u5728\u8fd9\u4e2a\u8fdc\u7a0b\u5206\u652f\u4e0a\u6267\u884c git fetch\uff0c\u6211\u4eec\u5c31\u53ef\u5728\u672c\u5730\u83b7\u53d6\u8fd9\u4e9b\u4fee\u6539\u3002\u8fd9\u4e0d\u4f1a\u4ee5\u4efb\u4f55\u65b9\u5f0f\u5f71\u54cd\u4f60\u7684\u672c\u5730\u5206\u652f\uff1afetch \u53ea\u662f\u5355\u7eaf\u5730\u4e0b\u8f7d\u65b0\u7684\u6570\u636e\u800c\u5df2\u3002<br \/><\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/d8ad65845a83f991b53f56faec1deebe-13.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe11\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe11\" \/><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u73b0\u5728\u6211\u4eec\u53ef\u4ee5\u770b\u5230\u81ea\u4e0a\u6b21\u63a8\u9001\u4ee5\u6765\u7684\u6240\u6709\u4fee\u6539\u4e86\u3002\u8fd9\u4e9b\u65b0\u6570\u636e\u4e5f\u5df2\u7ecf\u5728\u672c\u5730\u4e86\uff0c\u6211\u4eec\u53ef\u4ee5\u51b3\u5b9a\u7528\u8fd9\u4e9b\u65b0\u6570\u636e\u505a\u4ec0\u4e48\u4e86\u3002<br \/><\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><br \/><\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><strong>\u62c9\u53d6\uff08Pulling\uff09<\/strong><\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5c3d\u7ba1 git fetch \u53ef\u7528\u4e8e\u83b7\u53d6\u67d0\u4e2a\u5206\u652f\u7684\u8fdc\u7a0b\u4fe1\u606f\uff0c\u4f46\u6211\u4eec\u4e5f\u53ef\u4ee5\u6267\u884c git pull\u3002git pull \u5b9e\u9645\u4e0a\u662f\u4e24\u4e2a\u547d\u4ee4\u5408\u6210\u4e86\u4e00\u4e2a\uff1agit fetch \u548c git merge\u3002\u5f53\u6211\u4eec\u4ece\u6765\u6e90\u62c9\u53d6\u4fee\u6539\u65f6\uff0c\u6211\u4eec\u9996\u5148\u662f\u50cf git fetch \u90a3\u6837\u53d6\u56de\u6240\u6709\u6570\u636e\uff0c\u7136\u540e\u6700\u65b0\u7684\u4fee\u6539\u4f1a\u81ea\u52a8\u5408\u5e76\u5230\u672c\u5730\u5206\u652f\u4e2d\u3002<br \/><\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/68a2fcb02af1190b3f943bbd97993256-14.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe12\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe12\" \/><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5f88\u597d\uff0c\u6211\u4eec\u73b0\u5728\u4e0e\u8fdc\u7a0b\u5206\u652f\u5b8c\u7f8e\u540c\u6b65\u4e86\uff0c\u5e76\u4e14\u4e5f\u6709\u4e86\u6240\u6709\u6700\u65b0\u7684\u4fee\u6539\uff01<br \/><\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><br \/><\/span><br \/>\n<span style=\"max-width: 100%;font-size: 15px\"><strong>Reflog<\/strong><\/span><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u6bcf\u4e2a\u4eba\u90fd\u4f1a\u72af\u9519\uff0c\u4f46\u72af\u9519\u5176\u5b9e\u6ca1\u5565\uff01\u6709\u65f6\u5019\u4f60\u53ef\u80fd\u611f\u89c9\u4f60\u628a git repo \u5b8c\u5168\u641e\u574f\u4e86\uff0c\u8ba9\u4f60\u60f3\u5b8c\u5168\u5220\u4e86\u4e86\u4e8b\u3002<\/p>\n<p>git reflog \u662f\u4e00\u4e2a\u975e\u5e38\u6709\u7528\u7684\u547d\u4ee4\uff0c\u53ef\u4ee5\u5c55\u793a\u5df2\u7ecf\u6267\u884c\u8fc7\u7684\u6240\u6709\u52a8\u4f5c\u7684\u65e5\u5fd7\u3002\u5305\u62ec\u5408\u5e76\u3001\u91cd\u7f6e\u3001\u8fd8\u539f\uff0c\u57fa\u672c\u4e0a\u5305\u542b\u4f60\u5bf9\u4f60\u7684\u5206\u652f\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u3002<br \/><\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/68a2fcb02af1190b3f943bbd97993256-15.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe13\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe13\" \/><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u5982\u679c\u4f60\u72af\u4e86\u9519\uff0c\u4f60\u53ef\u4ee5\u6839\u636e reflog \u63d0\u4f9b\u7684\u4fe1\u606f\u901a\u8fc7\u91cd\u7f6e HEAD \u6765\u8f7b\u677e\u5730\u91cd\u505a\uff01<\/p>\n<p>\u5047\u8bbe\u6211\u4eec\u5b9e\u9645\u4e0a\u5e76\u4e0d\u9700\u8981\u5408\u5e76\u539f\u6709\u5206\u652f\u3002\u5f53\u6211\u4eec\u6267\u884c git reflog \u547d\u4ee4\u65f6\uff0c\u6211\u4eec\u53ef\u4ee5\u770b\u5230\u8fd9\u4e2a repo \u7684\u72b6\u6001\u5728\u5408\u5e76\u524d\u4f4d\u4e8e HEAD@{1}\u3002\u90a3\u6211\u4eec\u5c31\u6267\u884c\u4e00\u6b21 git reset\uff0c\u5c06 HEAD \u91cd\u65b0\u6307\u5411\u5728 HEAD@{1} \u7684\u4f4d\u7f6e\u3002<br \/><\/span><br \/>\n<br \/> <br \/>\n<img decoding=\"async\" src=\"https:\/\/img.php.cn\/upload\/article\/001\/273\/690\/68a2fcb02af1190b3f943bbd97993256-16.gif\" class=\"aligncenter\" title=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe14\" alt=\"\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\u63d2\u56fe14\" \/><br \/>\n<br \/> <br \/>\n<span style=\"max-width: 100%;font-size: 15px\">\u6211\u4eec\u53ef\u4ee5\u770b\u5230\u6700\u65b0\u7684\u52a8\u4f5c\u5df2\u88ab\u63a8\u9001\u7ed9 reflog\u3002<\/span> <\/p>\n<p>\u4ee5\u4e0a\u5c31\u662f\u51e0\u5341\u5f20\u52a8\u56fe\u544a\u8bc9\u4f60 Git\u5230\u5e95\u662f\u600e\u4e48\u73a9\u7684\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>merge\u3001git rebase\u3001git reset\u3001git revert\u3001git fetch\u3001git pull\u3001git reflog\u2026\u2026\u4f60\u77e5\u9053\u8fd9\u4e9b git \u547d\u4ee4\u6267\u884c\u7684\u7a76\u7adf\u662f\u4ec0\u4e48\u4efb\u52a1\u5417\uff1f\u5982\u679c\u4f60\u8fd8\u6709\u4e9b\u5206\u4e0d\u6e05\u695a\uff0c\u90a3\u5343\u4e07\u4e0d\u80fd\u9519\u8fc7\u8fd9\u7bc7\u6587\u7ae0\u3002\u5728\u672c\u6587\u4e2d\uff0c\u719f\u77e5 JavaScript\u3001TypeScript\u3001GraphQL\u3001Serverless\u3001AWS\u3001Docker \u548c Golang \u7684 21 \u5c81\u5e74\u8f7b\u8f6f\u4ef6\u987e\u95ee Lydia Hallie \u901a\u8fc7\u52a8\u56fe\u5f62\u5f0f\u76f4\u89c2\u5730\u4ecb\u7ecd\u4e86\u8fd9\u4e9b\u5e38\u7528 git \u547d\u4ee4\u7684\u5de5\u4f5c\u8fc7\u7a0b\uff0c\u5305\u4f60\u8fc7\u76ee\u4e0d\u5fd8\u3002 \u5c3d\u7ba1 Git \u662f\u4e00\u6b3e\u975e\u5e38\u5f3a\u5927\u7684\u5de5\u5177\uff0c\u4f46\u5982\u679c\u6211\u8bf4 Git \u7528\u8d77\u6765\u7b80\u76f4\u662f\u5669\u68a6\uff0c\u5927\u591a\u6570\u4eba\u4e5f\u4f1a\u8ba4\u540c\u6211\u7684\u8bf4\u6cd5\u3002\u6211\u53d1\u73b0\u5728\u4f7f\u7528 Git \u65f6\uff0c\u5728\u5934\u8111\u91cc\u53ef\u89c6\u5316\u5730\u60f3\u8c61\u5b83\u4f1a\u975e\u5e38\u6709\u7528\uff1a\u5f53\u6211\u6267\u884c\u4e00\u4e2a\u7279\u5b9a\u547d\u4ee4\u65f6\uff0c\u8fd9\u4e9b\u5206\u652f\u4f1a\u5982\u4f55\u4ea4\u4e92\uff0c\u53c8\u4f1a\u600e\u6837\u5f71\u54cd\u5386\u53f2\u8bb0\u5f55\uff1f\u4e3a\u4ec0\u4e48\u5f53\u6211\u5728 master \u4e0a\u6267\u884c\u786c\u91cd\u542f\uff0cforce push \u5230\u539f\u5206\u652f\u4ee5\u53ca rimraf \u6211\u4eec\u7684 .git \u6587\u4ef6\u5939\u65f6\uff0c\u6211\u7684\u540c\u4e8b\u54ed\u4e86\uff1f \u6211\u89c9\u5f97\u521b\u5efa\u4e00\u4e9b\u6700\u5e38\u7528\u4e14\u6700\u6709\u7528\u7684 Git \u547d\u4ee4\u7684\u53ef\u89c6\u5316\u793a\u4f8b\u4f1a\u662f\u4e00\u4e2a\u5b8c\u7f8e\u7684\u7528\u4f8b\uff01\u4e0b\u9762\u6211\u5c06\u4ecb\u7ecd\u7684\u5f88\u591a\u547d\u4ee4\u90fd\u6709\u53ef\u9009\u53c2\u6570\u2014\u2014\u4f60\u53ef\u4ee5\u4f7f\u7528\u8fd9\u4e9b\u53c2\u6570\u6765\u6539\u53d8\u5bf9\u5e94\u547d\u4ee4\u7684\u884c\u4e3a\u3002\u800c\u6211\u7684\u793a\u4f8b\u53ea\u4f1a\u6db5\u76d6\u547d\u4ee4\u7684\u9ed8\u8ba4\u884c\u4e3a\uff0c\u800c\u4e0d\u4f1a\u6dfb\u52a0\uff08\u6216\u6dfb\u52a0\u592a\u591a\uff09\u53ef\u9009\u914d\u7f6e\uff01 \u5408\u5e76 \u62e5\u6709\u591a\u4e2a\u5206\u652f\u662f\u5f88\u65b9\u4fbf\u7684\uff0c\u8fd9\u6837\u53ef\u4ee5\u5c06\u4e0d\u540c\u7684\u65b0\u4fee\u6539\u4e92\u76f8\u9694\u79bb\u5f00\uff0c\u800c\u4e14\u8fd8\u80fd\u786e\u4fdd\u4f60\u4e0d\u4f1a\u610f\u5916\u5730\u5411\u751f\u4ea7\u4ee3\u7801\u63a8\u9001\u672a\u7ecf\u8bb8\u53ef\u6216\u7834\u635f\u7684\u4ee3\u7801\u4fee\u6539\u3002\u4f46\u4e00\u65e6\u8fd9\u4e9b\u4fee\u6539\u5f97\u5230\u4e86\u6279\u51c6\u8bb8\u53ef\uff0c\u6211\u4eec\u5c31\u9700\u8981\u5c06\u5176\u90e8\u7f72\u5230\u6211\u4eec\u7684\u751f\u4ea7\u5206\u652f\u4e2d\uff01 \u53ef\u5c06\u4e00\u4e2a\u5206\u652f\u7684\u4fee\u6539\u878d\u5165\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u7684\u4e00\u79cd\u65b9\u5f0f\u662f\u6267\u884c git merge\u3002Git \u53ef\u6267\u884c\u4e24\u79cd\u7c7b\u578b\u7684\u5408\u5e76\uff1afast-forward \u548c no-fast-forward\u3002\u73b0\u5728\u4f60\u53ef\u80fd\u5206\u4e0d\u6e05\uff0c\u4f46\u6211\u4eec\u9a6c\u4e0a\u5c31\u6765\u770b\u770b\u5b83\u4eec\u7684\u5dee\u5f02\u6240\u5728\u3002 Fast-forward (\u2014ff) \u5728\u5f53\u524d\u5206\u652f\u76f8\u6bd4\u4e8e\u6211\u4eec\u8981\u5408\u5e76\u7684\u5206\u652f\u6ca1\u6709\u989d\u5916\u7684\u63d0\u4ea4\uff08commit\uff09\u65f6\uff0c\u53ef\u4ee5\u6267\u884c fast-forward \u5408\u5e76\u3002Git \u5f88\u61d2\uff0c\u9996\u5148\u4f1a\u5c1d\u8bd5\u6267\u884c\u6700\u7b80\u5355\u7684\u9009\u9879\uff1afast-forward\uff01\u8fd9\u7c7b\u5408\u5e76\u4e0d\u4f1a\u521b\u5efa\u65b0\u7684\u63d0\u4ea4\uff0c\u800c\u662f\u4f1a\u5c06\u6211\u4eec\u6b63\u5728\u5408\u5e76\u7684\u5206\u652f\u4e0a\u7684\u63d0\u4ea4\u76f4\u63a5\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u3002 \u5b8c\u7f8e\uff01\u73b0\u5728\uff0c\u6211\u4eec\u5728 dev \u5206\u652f\u4e0a\u6240\u505a\u7684\u6240\u6709\u6539\u53d8\u90fd\u5408\u5e76\u5230\u4e86 [&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-20380","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20380","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=20380"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20380\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20380"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20380"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20380"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}