{"id":100776,"date":"2026-09-05T09:42:15","date_gmt":"2026-09-05T01:42:15","guid":{"rendered":"https:\/\/www.wsisp.com\/helps\/100776.html"},"modified":"2026-09-05T09:42:15","modified_gmt":"2026-09-05T01:42:15","slug":"%e3%80%90%e8%a7%84%e8%8c%83%e3%80%91%e8%bf%99%e5%a5%97-git-%e8%a7%84%e8%8c%83%ef%bc%8c%e6%95%91%e4%ba%86%e6%95%b4%e4%b8%aa%e5%9b%a2%e9%98%9f","status":"publish","type":"post","link":"https:\/\/www.wsisp.com\/helps\/100776.html","title":{"rendered":"\u3010\u89c4\u8303\u3011\u8fd9\u5957 Git \u89c4\u8303\uff0c\u6551\u4e86\u6574\u4e2a\u56e2\u961f"},"content":{"rendered":"<h2>\u524d\u8a00<\/h2>\n<h3>&#x1f34a;\u7f18\u7531<\/h3>\n<h4>\u51cc\u66682\u70b9&#xff0c;\u4e00\u6b21 force push \u5f15\u53d1\u7684\u8840\u6848<\/h4>\n<p><img decoding=\"async\" src=\"https:\/\/www.wsisp.com\/helps\/wp-content\/uploads\/2026\/09\/20260905014210-6a9b7372823f9.png\" alt=\"\u5c01\u9762\uff1a\u51cc\u66682\u70b9\u7684 force push \u707e\u96be\" \/><\/p>\n<p>\u90a3\u5929\u51cc\u6668 2 \u70b9&#xff0c;\u5c0f\u674e\u4e00\u6761 git push &#8211;force&#xff0c;\u628a master \u4e0a\u4e09\u5929\u7684\u63d0\u4ea4\u5386\u53f2\u62b9\u5f97\u5e72\u5e72\u51c0\u51c0\u3002 \u6ca1\u4eba\u77e5\u9053\u7ebf\u4e0a\u4ee3\u7801\u5bf9\u5e94\u54ea\u4e2a commit&#xff0c;\u6ca1\u4eba\u6562\u53d1\u5e03&#xff0c;\u9886\u5bfc\u5728\u7fa4\u91cc\u7529\u4e86\u4e00\u4e2a\u5b57&#xff1a;\u67e5\u3002 \u4e8b\u540e\u590d\u76d8&#xff0c;\u9886\u5bfc\u5199\u4e0b\u4e00\u4efd\u56e2\u961f Git \u89c4\u8303\u3002\u4eca\u5929\u5168\u6587\u516c\u5f00&#xff0c;\u53ea\u8981\u56e2\u961f\u8d85\u8fc7 3 \u4e2a\u4eba&#xff0c;\u7167\u6284\u5c31\u80fd\u7528\u3002<\/p>\n<p>&#x1f3c0;\u4e8b\u60c5\u8d77\u56e0&#xff1a; \u5927\u5bb6\u597d&#xff0c;\u6211\u662f JavaDog\u7a0b\u5e8f\u72d7\u3002\u4eca\u5929\u804a\u70b9\u4fdd\u547d\u7684&#xff0c;\u4e00\u5957\u7531\u56e2\u961f\u9886\u5bfc\u5236\u5b9a&#xff0c;\u6700\u5168\u4f01\u4e1a\u7ea7Git\u89c4\u8303\u3002<\/p>\n<p>\u4f60\u5927\u6982\u7387\u89c1\u8fc7\u8fd9\u4e9b\u5206\u652f\u540d&#xff1a;<\/p>\n<p>branch-1<br \/>\nbranch-2<br \/>\nbranch-final<br \/>\nbranch-\u771ffinal<br \/>\nbranch-\u7ec8\u6781\u7248-\u522b\u5220<br \/>\n\u5f20\u4e09\u7684\u5206\u652f<br \/>\n\u4fee\u590d\u4e00\u4e0b<\/p>\n<p>\u4e0a\u7ebf\u524d\u7684\u95ee\u9898\u624d\u8981\u547d\u3002\u8fd9\u4e2a bug \u5230\u5e95\u4fee\u6ca1\u4fee&#xff1f;\u4fee\u4e86&#xff0c;\u5728\u67d0\u4e2a\u5206\u652f\u4e0a&#xff0c;\u6ca1\u4eba\u8bb0\u5f97\u662f\u54ea\u4e2a\u3002\u7ebf\u4e0a\u8dd1\u7684\u7a76\u7adf\u662f\u54ea\u4efd\u4ee3\u7801&#xff1f;\u67e5\u4e0d\u51fa\u6765&#xff0c;\u7248\u672c\u53f7\u662f\u4e0a\u5468\u4e09\u968f\u624b\u6539\u7684\u3002\u771f\u8981\u56de\u6eda&#xff1f;\u56de\u6eda\u5230\u54ea&#xff0c;\u600e\u4e48\u6eda&#xff0c;\u8c01\u8d1f\u8d23&#xff1f;<\/p>\n<p>\u8bf4\u767d\u4e86\u5c31\u4e00\u53e5\u8bdd&#xff1a;\u4f60\u6ca1\u5b9a\u6b7b\u5206\u652f\u4ece\u54ea\u6765\u3001\u5408\u5230\u54ea\u53bb&#xff0c;\u6240\u6709\u4eba\u90fd\u5728\u4e00\u4e2a\u6c60\u5b50\u91cc\u778e\u6251\u817e\u3002<\/p>\n<p>\u89c4\u8303\u7528\u4e00\u5f20\u8868\u628a\u8fd9\u4e8b\u9489\u6b7b\u4e86\u3002\u4e0b\u9762\u6211\u62ff\u7535\u5546 v2.1.0 \u90a3\u6b21\u8fed\u4ee3\u4e3e\u4f8b&#xff0c;\u4ece\u5934\u5230\u5c3e\u8d70\u4e00\u904d\u3002\u4f60\u770b\u5b8c\u5c31\u77e5\u9053\u4e0b\u6b21\u600e\u4e48\u4e0d\u80cc\u9505\u3002<\/p>\n<hr \/>\n<h3>&#x1f3af;\u4e3b\u8981\u76ee\u6807<\/h3>\n<h4>\u672c\u6587\u5e26\u4f60\u8d70\u5b8c\u4e00\u6b21\u5b8c\u6574\u53d1\u7248<\/h4>\n<ul>\n<li>\u8ba4\u8bc6\u4e24\u4e2a\u6c38\u8fdc\u5b58\u5728\u7684\u6b63\u5f0f\u5458\u5de5&#xff1a;master \u548c develop<\/li>\n<li>\u4ece\u62c9\u5206\u652f\u5230\u4e0a\u7ebf&#xff0c;7 \u6b65\u8d70\u5b8c\u4e0d\u8e29\u5751<\/li>\n<li>\u84dd\u7eff\u90e8\u7f72\u548c\u79d2\u7ea7\u56de\u6eda&#xff0c;\u4e8b\u6545\u6765\u4e86\u4e0d\u614c<\/li>\n<li>\u4e94\u5f20\u901f\u67e5\u8868 &#043; \u4e94\u6761\u7ea2\u7ebf&#xff0c;\u6253\u5370\u8d34\u5899\u968f\u65f6\u770b<\/li>\n<\/ul>\n<hr \/>\n<h2>\u6b63\u6587<\/h2>\n<h3>&#x1f36a;\u89c4\u8303\u62c6\u89e3<\/h3>\n<h4>\u4e00.\u5148\u8ba4\u8bc6\u4e24\u4e2a\u6c38\u8fdc\u5b58\u5728\u7684\u6b63\u5f0f\u5458\u5de5<\/h4>\n<table>\n<tr>\u5206\u652f\u662f\u4ec0\u4e48\u8c01\u80fd\u6539<\/tr>\n<tbody>\n<tr>\n<td>master<\/td>\n<td>\u751f\u4ea7\u73af\u5883\u6b63\u5728\u8dd1\u7684\u4ee3\u7801&#xff0c;\u6bcf\u4e2a commit \u90fd\u80fd\u76f4\u63a5\u4e0a\u7ebf<\/td>\n<td>\u6ca1\u4eba\u80fd\u76f4\u63a5\u6539&#xff0c;\u53ea\u80fd\u901a\u8fc7 MR \u5408\u5e76<\/td>\n<\/tr>\n<tr>\n<td>develop<\/td>\n<td>\u5f00\u53d1\u4e3b\u7ebf&#xff0c;\u529f\u80fd\u90fd\u6c47\u5230\u8fd9\u91cc<\/td>\n<td>\u540c\u4e0a<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<p>\u5176\u4ed6\u5206\u652f&#xff0c;\u4e0d\u7ba1\u662f feature\u3001sprint\u3001bugfix\u3001release \u8fd8\u662f hotfix&#xff0c;\u90fd\u662f\u4e34\u65f6\u5de5&#xff0c;\u7528\u5b8c\u5c31\u5220\u3002<\/p>\n<p>&#x1f47d;\u4eba\u8bdd\u89e3\u91ca master \u662f\u751f\u4ea7\u73af\u5883\u6b63\u5728\u8dd1\u7684\u4ee3\u7801&#xff0c;\u6bcf\u4e2a commit \u90fd\u80fd\u76f4\u63a5\u4e0a\u7ebf&#xff1b;develop \u662f\u6240\u6709\u529f\u80fd\u7684\u6c47\u5408\u70b9\u3002\u5269\u4e0b\u90a3\u4e9b\u5206\u652f\u90fd\u662f\u4e34\u65f6\u5de5&#xff0c;\u6d3b\u5e72\u5b8c\u5c31\u5220&#xff0c;\u522b\u517b\u7740\u3002<\/p>\n<p>\u8fd9\u5c31\u662f\u7b2c\u4e00\u9053\u9632\u7ebf\u3002master \u4e0a\u4f60\u987a\u624b\u63d0\u4ea4\u7684\u4ee3\u7801&#xff0c;\u7edd\u4e0d\u53ef\u80fd\u51fa\u73b0\u3002\u60f3\u76f4\u63a5\u52a8 master&#xff1f;\u95e8\u90fd\u6ca1\u6709&#xff0c;\u5206\u652f\u4fdd\u62a4\u5148\u628a\u4f60\u6321\u56de\u53bb\u3002<\/p>\n<p><img decoding=\"async\" src=\"https:\/\/www.wsisp.com\/helps\/wp-content\/uploads\/2026\/09\/20260905014211-6a9b7373757cc.png\" alt=\"\u5206\u652f\u6a21\u578b\uff1amaster \u548c develop \u662f\u6b63\u5f0f\u5458\u5de5\uff0c\u5176\u4ed6\u662f\u4e34\u65f6\u5de5\" \/><\/p>\n<hr \/>\n<h4>\u4e8c.\u5b8c\u6574\u6545\u4e8b&#xff1a;\u7535\u5546\u5e73\u53f0 v2.1.0 \u8fed\u4ee3<\/h4>\n<p>\u80cc\u666f\u5148\u8bf4\u6e05\u695a&#xff1a;\u7ebf\u4e0a\u73b0\u5728\u8dd1\u7684\u662f v2.0.0\u3002\u8fd9\u6b21\u8fed\u4ee3\u8981\u5e72\u4e24\u4ef6\u4e8b&#xff0c;\u5fae\u4fe1\u652f\u4ed8\u5347\u7ea7\u4ea4\u7ed9\u5c0f\u5f20&#xff0c;\u7528\u6237\u4e2d\u5fc3\u91cd\u6784\u4ea4\u7ed9\u5c0f\u674e\u3002\u5bf9&#xff0c;\u5c31\u662f\u5f00\u5934\u90a3\u4e2a\u5c0f\u674e&#xff0c;\u8fd9\u56de\u4ed6\u8001\u5b9e\u4e86\u3002<\/p>\n<h5>1.\u8fed\u4ee3\u5f00\u59cb&#xff0c;\u62c9 sprint \u5206\u652f&#xff08;\u8fed\u4ee3\u8d1f\u8d23\u4eba\u505a&#xff09;<\/h5>\n<p>\u4e00\u4e2a\u8fed\u4ee3\u9700\u8981\u4e00\u4e2a\u6536\u4f5c\u4e1a\u7684\u5206\u652f&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> checkout develop <span class=\"token operator\">&amp;&amp;<\/span> <span class=\"token function\">git<\/span> pull origin develop<br \/>\n<span class=\"token function\">git<\/span> checkout <span class=\"token parameter variable\">-b<\/span> sprint-v2.1<br \/>\n<span class=\"token function\">git<\/span> push origin sprint-v2.1<\/p>\n<p>\u68c0\u67e5\u70b9&#xff1a;\u7248\u672c\u53f7\u5148\u522b\u52a8&#xff0c;\u8fd8\u662f 2.0.0\u3002\u65e5\u5e38\u5f00\u53d1\u9636\u6bb5\u4e00\u5f8b\u4e0d\u6539\u7248\u672c\u53f7&#xff0c;\u8fd9\u6761\u8bb0\u6b7b\u4e86&#xff0c;\u540e\u9762\u6709\u5927\u7528\u3002\u591a\u5c11\u4eba\u683d\u5728\u8fd9&#xff1a;\u5f00\u53d1\u5230\u4e00\u534a\u624b\u75d2\u6539\u4e86\u7248\u672c\u53f7&#xff0c;\u6700\u540e\u8fde\u81ea\u5df1\u90fd\u5206\u4e0d\u6e05\u6253\u51fa\u6765\u7684\u5305\u662f\u5565\u3002<\/p>\n<hr \/>\n<h5>2.\u5c0f\u5f20\u5f00\u53d1\u5fae\u4fe1\u652f\u4ed8&#xff08;\u5f00\u53d1\u505a&#xff09;<\/h5>\n<p>\u94c1\u5f8b&#xff1a;\u6c38\u8fdc\u522b\u5728 sprint \u4e0a\u76f4\u63a5\u5f00\u5199&#xff0c;\u62c9\u4f60\u81ea\u5df1\u7684 feature \u5206\u652f\u3002\u4f60\u76f4\u63a5\u5728 sprint \u4e0a\u6539&#xff0c;\u7b49\u4e8e\u5168\u73ed\u5171\u7528\u4e00\u5f20\u8349\u7a3f\u7eb8&#xff0c;\u8c01\u90fd\u770b\u4e0d\u6e05\u8c01\u5199\u4e86\u5565\u3002<\/p>\n<p><span class=\"token function\">git<\/span> checkout sprint-v2.1 <span class=\"token operator\">&amp;&amp;<\/span> <span class=\"token function\">git<\/span> pull origin sprint-v2.1<br \/>\n<span class=\"token function\">git<\/span> checkout <span class=\"token parameter variable\">-b<\/span> feature-wechat-pay-v2<\/p>\n<p>\u5199\u4ee3\u7801\u3001\u63d0\u4ea4&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> commit <span class=\"token parameter variable\">-m<\/span> <span class=\"token string\">&#034;feat(pay): add WeChat Pay v3 API support&#034;<\/span><\/p>\n<p>sprint \u6709\u65b0\u4ee3\u7801\u8fdb\u6765\u4e86&#xff1f;\u540c\u6b65&#xff0c;\u7528 rebase \u4fdd\u6301\u7ebf\u6027\u5386\u53f2&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> checkout sprint-v2.1 <span class=\"token operator\">&amp;&amp;<\/span> <span class=\"token function\">git<\/span> pull origin sprint-v2.1<br \/>\n<span class=\"token function\">git<\/span> checkout feature-wechat-pay-v2<br \/>\n<span class=\"token function\">git<\/span> rebase sprint-v2.1<\/p>\n<p>\u529f\u80fd\u5199\u5b8c&#xff0c;\u522b\u81ea\u5df1 merge&#xff0c;\u53d1\u8d77 MR&#xff1a;feature-wechat-pay-v2 \u5408\u5230 sprint-v2.1\u3002<\/p>\n<p>MR \u4f1a\u81ea\u52a8\u8dd1 CI&#xff0c;\u7f16\u8bd1\u3001lint\u3001\u5355\u6d4b\u5168\u5957\u3002\u8fd8\u6709\u4e2a AI Code Review \u5148\u626b\u4e00\u904d\u7ed9\u5efa\u8bae&#xff0c;\u53ea\u5efa\u8bae\u4e0d\u5361\u4eba&#xff0c;\u7701\u5f97\u4f60\u7b49\u540c\u4e8b review \u65f6\u624d\u53d1\u73b0\u4f4e\u7ea7\u9519\u8bef\u3002\u7136\u540e\u7b49\u4e00\u4f4d\u540c\u4e8b approve&#xff0c;\u518d\u7528 Squash Merge \u5408\u8fdb\u53bb\u3002<\/p>\n<p>\u4e3a\u4ec0\u4e48\u7528 Squash&#xff1f;\u4f60\u5f00\u53d1\u65f6\u7684\u63d0\u4ea4\u5386\u53f2\u957f\u8fd9\u6837&#xff1a;<\/p>\n<p>feat(pay): add WeChat Pay v3 API support<br \/>\nfix: \u4fee\u4e00\u4e0b<br \/>\nfix: \u518d\u4fee\u4e00\u4e0b<br \/>\nfix: \u554a\u554a\u554a\u7ec8\u4e8e\u597d\u4e86<\/p>\n<p>\u770b\u7740\u5c31\u5934\u76ae\u53d1\u9ebb\u5427\u3002Squash Merge \u628a\u5b83\u4eec\u538b\u6210 1 \u4e2a\u5e72\u51c0\u7684 commit&#xff0c;sprint \u5386\u53f2\u4ece\u6b64\u6e05\u723d&#xff0c;\u540e\u4eba\u63a5\u624b\u4e0d\u7528\u731c\u4f60\u4e2d\u95f4\u90a3\u51e0\u53d1\u62bd\u98ce\u662f\u6539\u4e86\u5565\u3002<\/p>\n<p>\u5408\u5e76\u540e&#xff0c;\u4e34\u65f6\u5de5\u8d70\u4eba&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> branch <span class=\"token parameter variable\">-d<\/span> feature-wechat-pay-v2<br \/>\n<span class=\"token function\">git<\/span> push origin <span class=\"token parameter variable\">&#8211;delete<\/span> feature-wechat-pay-v2<\/p>\n<p>\u5c0f\u674e\u7684 feature-user-center \u8d70\u540c\u6837\u6d41\u7a0b\u3002<\/p>\n<hr \/>\n<h5>3.\u8054\u8c03&#xff0c;sprint \u5408\u56de develop<\/h5>\n<p>\u628a sprint-v2.1 \u90e8\u7f72\u5230 TEST \u73af\u5883&#xff08;\u6e90\u7801\u7f16\u8bd1&#xff09;&#xff0c;QA \u8054\u8c03\u8fc7\u4e86\u518d\u8bf4&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> checkout develop <span class=\"token operator\">&amp;&amp;<\/span> <span class=\"token function\">git<\/span> pull origin develop<br \/>\n<span class=\"token function\">git<\/span> merge &#8211;no-ff sprint-v2.1     <span class=\"token comment\"># \u4fdd\u7559\u8fed\u4ee3\u75d5\u8ff9<\/span><br \/>\n<span class=\"token function\">git<\/span> push origin develop<\/p>\n<p>\u4e3a\u4ec0\u4e48\u8fd9\u6b21\u4e0d\u7528 Squash&#xff0c;\u6539\u7528 &#8211;no-ff&#xff1f;\u8bb0\u4f4f\u4e00\u53e5\u8bdd&#xff1a;<\/p>\n<p>\u4e2a\u4eba\u5de5\u4f5c\u5206\u652f\u538b\u6241&#xff08;Squash&#xff09;&#xff0c;\u516c\u5171\u91cc\u7a0b\u7891\u7559\u75d5&#xff08;\u2013no-ff&#xff09;\u3002<\/p>\n<p>\u2013no-ff \u4f1a\u5728\u5386\u53f2\u56fe\u4e0a\u7559\u4e00\u4e2a\u8fed\u4ee3\u6c47\u603b\u8282\u70b9&#xff0c;\u5341\u5e74\u540e\u8fd8\u80fd\u4e00\u773c\u770b\u51fa v2.1 \u8fed\u4ee3\u5230\u5e95\u585e\u4e86\u54ea\u4e9b\u529f\u80fd\u3002Squash \u548c &#8211;no-ff \u4e0d\u662f\u4e8c\u9009\u4e00&#xff0c;\u662f\u4f60\u4e2a\u4eba\u7684\u6d3b\u538b\u6241\u3001\u516c\u5171\u7684\u91cc\u7a0b\u7891\u7559\u75d5&#xff0c;\u5404\u7528\u5404\u7684\u3002<\/p>\n<p>\u6709\u4e2a\u4f8b\u5916&#xff1a;\u8fed\u4ee3\u53ea\u6709\u4e00\u4e2a\u529f\u80fd\u65f6&#xff0c;\u8df3\u8fc7 sprint&#xff0c;feature \u76f4\u63a5\u5408 develop \u5c31\u884c\u3002\u89c4\u77e9\u662f\u4e3a\u4eba\u670d\u52a1\u7684&#xff0c;\u4e0d\u662f\u53cd\u8fc7\u6765\u3002<\/p>\n<hr \/>\n<h5>4.\u5207 release \u5206\u652f&#xff0c;\u6b64\u523b\u624d\u5b9a\u7248\u672c\u53f7<\/h5>\n<p>\u4ece develop \u62c9 release&#xff0c;\u4e0d\u662f sprint&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> checkout develop <span class=\"token operator\">&amp;&amp;<\/span> <span class=\"token function\">git<\/span> pull origin develop<br \/>\n<span class=\"token function\">git<\/span> checkout <span class=\"token parameter variable\">-b<\/span> release-v2.1.0<br \/>\n<span class=\"token function\">git<\/span> push origin release-v2.1.0<\/p>\n<p>\u6b64\u523b\u505a\u4e24\u4ef6\u4e8b&#xff1a;<\/p>\n<li>\u4fee\u6539\u7248\u672c\u53f7&#xff1a;2.0.0 \u53d8\u6210 2.1.0<\/li>\n<li>\u628a SNAPSHOT \u4f9d\u8d56\u6362\u6210\u6b63\u5f0f\u7248<\/li>\n<p>\u94c1\u5f8b&#xff0c;SNAPSHOT \u4e0d\u8fc7\u5899\u3002SNAPSHOT \u662f\u80fd\u88ab\u522b\u4eba\u968f\u65f6\u8986\u76d6\u7684\u8349\u7a3f\u4f9d\u8d56&#xff0c;\u4eca\u5929\u6253\u5305\u7528 1.2-SNAPSHOT&#xff0c;\u660e\u5929\u540c\u4e8b\u4e00\u8986\u76d6&#xff0c;\u4f60\u5c31\u518d\u4e5f\u6253\u4e0d\u51fa\u4e00\u6a21\u4e00\u6837\u7684\u5305\u3002\u6240\u4ee5 SNAPSHOT \u7edd\u4e0d\u8bb8\u8fdb master \u548c PROD\u3002release \u5206\u652f\u5c31\u662f\u4e2a\u9694\u79bb\u75c5\u623f&#xff0c;\u53d1\u5e03\u524d\u6240\u6709\u4f9d\u8d56\u5728\u8fd9\u91cc\u5168\u90e8\u8f6c\u6b63&#xff0c;\u8c01\u4e5f\u522b\u60f3\u534a\u8def\u585e\u4e2a\u8349\u7a3f\u8fdb\u6765\u3002<\/p>\n<hr \/>\n<h5>5.QA \u9a8c\u8bc1&#xff0c;\u6253 RC \u5019\u9009\u955c\u50cf<\/h5>\n<p><span class=\"token function\">docker<\/span> build <span class=\"token parameter variable\">-t<\/span> harbor.example.com\/app:v2.1.0-rc1 <span class=\"token builtin class-name\">.<\/span><br \/>\n<span class=\"token function\">docker<\/span> push harbor.example.com\/app:v2.1.0-rc1<\/p>\n<p>QA \u4e09\u677f\u65a7&#xff1a;<\/p>\n<table>\n<tr>\u6b65\u9aa4\u9a8c\u4ec0\u4e48\u4f8b\u5b50<\/tr>\n<tbody>\n<tr>\n<td>\u2460 \u4e3b\u94fe\u8def\u56de\u5f52<\/td>\n<td>\u9ad8\u9891\u8001\u529f\u80fd\u6ca1\u88ab\u6539\u574f<\/td>\n<td>\u4e0b\u5355\u3001\u652f\u4ed8\u3001\u9000\u6b3e\u8fd8\u80fd\u8d70\u901a<\/td>\n<\/tr>\n<tr>\n<td>\u2461 \u53d8\u66f4\u529f\u80fd\u9a8c\u6536<\/td>\n<td>\u65b0\u529f\u80fd\u6b63\u786e<\/td>\n<td>\u5fae\u4fe1\u652f\u4ed8\u5347\u7ea7\u540e\u80fd\u6b63\u5e38\u4ed8\u6b3e<\/td>\n<\/tr>\n<tr>\n<td>\u2462 \u6027\u80fd\u89c2\u5bdf<\/td>\n<td>\u6ca1\u53d8\u6162<\/td>\n<td>\u652f\u4ed8\u63a5\u53e3\u8017\u65f6\u5bf9\u6bd4\u4e0a\u7248\u672c\u65e0\u660e\u663e\u52a3\u5316<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<p>QA \u771f\u53d1\u73b0\u95ee\u9898\u4e86&#xff1a;\u652f\u4ed8\u91d1\u989d\u56db\u820d\u4e94\u5165\u5dee 1 \u5206\u94b1\u3002\u8fd9 bug \u4e0a\u7ebf\u5c31\u662f\u5ba2\u8bc9&#xff0c;\u7ebf\u4e0b\u5c31\u662f\u771f\u91d1\u767d\u94f6\u3002\u600e\u4e48\u529e&#xff1f;\u4ece release \u62c9\u4e2a bugfix \u4fee&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> checkout <span class=\"token parameter variable\">-b<\/span> bugfix-pay-rounding release-v2.1.0<br \/>\n<span class=\"token comment\"># \u4fee\u590d\u4ee3\u7801\u2026\u2026<\/span><br \/>\n<span class=\"token function\">git<\/span> commit <span class=\"token parameter variable\">-m<\/span> <span class=\"token string\">&#034;fix(pay): correct rounding precision for amount&#034;<\/span><br \/>\n<span class=\"token comment\"># Squash Merge \u56de release&#xff08;1 \u4eba Approve&#xff09;<\/span><br \/>\n<span class=\"token function\">git<\/span> checkout release-v2.1.0<br \/>\n<span class=\"token function\">git<\/span> merge <span class=\"token parameter variable\">&#8211;squash<\/span> bugfix-pay-rounding<br \/>\n<span class=\"token function\">git<\/span> commit <span class=\"token parameter variable\">-m<\/span> <span class=\"token string\">&#034;fix(pay): correct rounding precision for amount&#034;<\/span><br \/>\n<span class=\"token function\">git<\/span> push origin release-v2.1.0<br \/>\n<span class=\"token function\">git<\/span> branch <span class=\"token parameter variable\">-d<\/span> bugfix-pay-rounding<\/p>\n<p>\u4fee\u5b8c\u91cd\u6253\u955c\u50cf&#xff0c;rc \u5e8f\u53f7\u52a0\u4e00&#xff0c;\u53d8\u6210 v2.1.0-rc2&#xff0c;\u518d\u9a8c\u8bc1&#xff0c;\u76f4\u5230\u5168\u7eff\u3002<\/p>\n<p>RC \u5019\u9009\u7248\u53ef\u4ee5\u8986\u76d6\u7740\u6253&#xff0c;\u4f46\u6b63\u5f0f\u7248 Tag \u6c38\u4e0d\u8986\u76d6\u3002\u8fd9\u5c31\u662f\u7248\u672c\u6709\u552f\u4e00\u771f\u6e90\u8fd9\u4e2a\u8bf4\u6cd5\u7684\u7531\u6765&#xff0c;\u51fa\u4e8b\u4f60\u80fd\u7cbe\u786e\u5230 commit \u6307\u7740\u9f3b\u5b50\u8bf4\u5c31\u662f\u8fd9\u7248\u3002<\/p>\n<hr \/>\n<h5>6.\u6b63\u5f0f\u53d1\u5e03&#xff08;master \u9700\u8981 2 \u4eba Approve&#xff09;<\/h5>\n<p><span class=\"token function\">git<\/span> checkout master <span class=\"token operator\">&amp;&amp;<\/span> <span class=\"token function\">git<\/span> pull origin master<br \/>\n<span class=\"token function\">git<\/span> merge &#8211;no-ff release-v2.1.0     <span class=\"token comment\"># 2 \u4eba Approve \u624d\u80fd\u5408<\/span><br \/>\n<span class=\"token function\">git<\/span> tag <span class=\"token parameter variable\">-a<\/span> v2.1.0 <span class=\"token parameter variable\">-m<\/span> <span class=\"token string\">&#034;Release v2.1.0&#034;<\/span><br \/>\n<span class=\"token function\">git<\/span> push origin master <span class=\"token parameter variable\">&#8211;tags<\/span><\/p>\n<p>\u6784\u5efa\u6b63\u5f0f\u955c\u50cf&#xff0c;\u6b63\u5f0f\u7248\u52a0 latest&#xff1a;<\/p>\n<p><span class=\"token function\">docker<\/span> build <span class=\"token parameter variable\">-t<\/span> harbor.example.com\/app:v2.1.0 <span class=\"token builtin class-name\">.<\/span><br \/>\n<span class=\"token function\">docker<\/span> tag harbor.example.com\/app:v2.1.0 harbor.example.com\/app:latest<br \/>\n<span class=\"token function\">docker<\/span> push harbor.example.com\/app:v2.1.0<br \/>\n<span class=\"token function\">docker<\/span> push harbor.example.com\/app:latest<\/p>\n<p>\u84dd\u7eff\u90e8\u7f72&#xff0c;\u8bf4\u767d\u4e86\u5c31\u662f\u4e24\u53f0\u4e00\u6a21\u4e00\u6837\u7684\u670d\u52a1\u5668\u3002\u4e00\u53f0&#xff08;BLUE&#xff09;\u6b63\u625b\u7740\u6d41\u91cf&#xff0c;\u65b0\u7248\u672c\u6084\u6084\u90e8\u7f72\u5230\u53e6\u4e00\u53f0&#xff08;GREEN&#xff09;&#xff0c;\u5192\u70df\u9a8c\u8bc1\u6ca1\u95ee\u9898&#xff0c;\u62e8\u4e00\u4e0b\u5f00\u5173&#xff0c;\u6d41\u91cf\u5207\u8fc7\u53bb&#xff0c;\u7528\u6237\u5168\u7a0b\u65e0\u611f\u3002\u8fd9\u4e00\u6b65\u8fd0\u7ef4\u6765&#xff1a;<\/p>\n<p><span class=\"token comment\"># 1. \u5f53\u524d BLUE \u5728\u7ebf \u2192 \u65b0\u7248\u672c\u90e8\u7f72\u5230 GREEN<\/span><br \/>\n<span class=\"token function\">docker-compose<\/span> <span class=\"token parameter variable\">-f<\/span> docker-compose.green.yml up <span class=\"token parameter variable\">-d<\/span><\/p>\n<p><span class=\"token comment\"># 2. \u5192\u70df\u9a8c\u8bc1 GREEN<\/span><br \/>\n<span class=\"token function\">curl<\/span> http:\/\/green-host:8080\/health<\/p>\n<p><span class=\"token comment\"># 3. \u5207\u6d41\u91cf&#xff0c;\u53cc\u6d3b\u4e0a\u7ebf<\/span><br \/>\nnginx <span class=\"token parameter variable\">-s<\/span> reload<\/p>\n<p><span class=\"token comment\"># 4. \u540c\u6b65\u5347\u7ea7 BLUE&#xff0c;\u4e3a\u4e0b\u6b21\u53d1\u5e03\u505a\u51c6\u5907<\/span><br \/>\n<span class=\"token function\">docker-compose<\/span> <span class=\"token parameter variable\">-f<\/span> docker-compose.blue.yml up <span class=\"token parameter variable\">-d<\/span><\/p>\n<p><img decoding=\"async\" src=\"https:\/\/www.wsisp.com\/helps\/wp-content\/uploads\/2026\/09\/20260905014212-6a9b73745f8fb.png\" alt=\"\u84dd\u7eff\u90e8\u7f72\uff1a\u53cc\u73af\u5883\u79d2\u7ea7\u5207\u6362\" \/><\/p>\n<p>\u8fd8\u6709\u6536\u5c3e\u8fd9\u6b65\u522b\u5fd8\u4e86&#xff1a;release \u671f\u95f4\u4fee\u7684 bug \u8981\u540c\u6b65\u56de develop&#xff0c;\u7136\u540e\u5220\u6389 release \u5206\u652f&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> checkout develop<br \/>\n<span class=\"token function\">git<\/span> merge &#8211;no-ff release-v2.1.0<br \/>\n<span class=\"token function\">git<\/span> push origin develop<br \/>\n<span class=\"token function\">git<\/span> branch <span class=\"token parameter variable\">-d<\/span> release-v2.1.0<\/p>\n<p>v2.1.0 \u4e0a\u7ebf\u5b8c\u6210\u3002<\/p>\n<hr \/>\n<h5>7.\u51cc\u6668 2 \u70b9\u7684\u4e8b\u6545&#xff1a;Hotfix \u4e0e\u79d2\u7ea7\u56de\u6eda<\/h5>\n<p>\u4e0a\u7ebf\u7b2c\u4e8c\u5929&#xff0c;\u7528\u6237\u53cd\u9988\u652f\u4ed8\u5076\u53d1\u8d85\u65f6\u3002<\/p>\n<p>\u60c5\u51b5\u4e00&#xff1a;\u80fd\u5b9a\u4f4d\u3001\u80fd\u4fee\u590d&#xff0c;\u8d70 hotfix<\/p>\n<p><span class=\"token comment\"># \u4ece master&#xff08;\u4e0d\u662f develop&#xff01;&#xff09;\u5207\u5206\u652f<\/span><br \/>\n<span class=\"token function\">git<\/span> checkout master<br \/>\n<span class=\"token function\">git<\/span> checkout <span class=\"token parameter variable\">-b<\/span> hotfix-pay-timeout<\/p>\n<p><span class=\"token comment\"># \u4fee\u590d&#xff0c;\u7248\u672c\u53f7 PATCH &#043;1&#xff1a;2.1.0 \u2192 2.1.1<\/span><br \/>\n<span class=\"token function\">git<\/span> commit <span class=\"token parameter variable\">-m<\/span> <span class=\"token string\">&#034;fix(pay): increase payment gateway timeout to 10s&#034;<\/span><\/p>\n<p><span class=\"token comment\"># \u5408\u56de master &#043; \u6253 Tag&#xff08;2 \u4eba Approve&#xff09;<\/span><br \/>\n<span class=\"token function\">git<\/span> checkout master<br \/>\n<span class=\"token function\">git<\/span> merge &#8211;no-ff hotfix-pay-timeout<br \/>\n<span class=\"token function\">git<\/span> tag <span class=\"token parameter variable\">-a<\/span> v2.1.1 <span class=\"token parameter variable\">-m<\/span> <span class=\"token string\">&#034;Hotfix: payment timeout&#034;<\/span><br \/>\n<span class=\"token function\">git<\/span> push origin master <span class=\"token parameter variable\">&#8211;tags<\/span><\/p>\n<p><span class=\"token comment\"># \u540c\u6b65\u56de develop&#xff0c;\u5220\u5206\u652f<\/span><br \/>\n<span class=\"token function\">git<\/span> checkout develop<br \/>\n<span class=\"token function\">git<\/span> merge &#8211;no-ff hotfix-pay-timeout<br \/>\n<span class=\"token function\">git<\/span> push origin develop<br \/>\n<span class=\"token function\">git<\/span> branch <span class=\"token parameter variable\">-d<\/span> hotfix-pay-timeout<\/p>\n<p>\u7136\u540e\u6784\u5efa v2.1.1 \u955c\u50cf&#xff0c;\u84dd\u7eff\u90e8\u7f72\u4e0a\u7ebf&#xff08;\u540c\u7b2c 6 \u6b65&#xff09;\u3002<\/p>\n<p>\u60c5\u51b5\u4e8c&#xff1a;\u592a\u4e25\u91cd&#xff0c;\u6839\u672c\u6765\u4e0d\u53ca\u4fee&#xff0c;\u76f4\u63a5\u56de\u6eda<\/p>\n<p>\u4e24\u884c\u547d\u4ee4&#xff0c;\u79d2\u7ea7&#xff0c;\u96f6\u505c\u673a&#xff0c;\u65e7\u7248\u672c\u8fd8\u5b8c\u6574\u5f85\u5728\u53e6\u4e00\u4e2a\u73af\u5883\u91cc&#xff1a;<\/p>\n<p><span class=\"token function\">sed<\/span> <span class=\"token parameter variable\">-i<\/span> <span class=\"token string\">&#039;s\/server app-green\/server app-blue\/&#039;<\/span> nginx\/nginx.conf<br \/>\nnginx <span class=\"token parameter variable\">-s<\/span> reload<\/p>\n<p><img decoding=\"async\" src=\"https:\/\/www.wsisp.com\/helps\/wp-content\/uploads\/2026\/09\/20260905014213-6a9b73755af45.png\" alt=\"\u56de\u6eda\uff1a\u4e24\u884c\u547d\u4ee4\u79d2\u7ea7\u6062\u590d\" \/><\/p>\n<p>\u56de\u6eda\u540e\u5fc5\u987b\u7b2c\u4e00\u65f6\u95f4\u901a\u77e5\u5168\u56e2\u961f&#xff0c;\u4e0d\u7136\u5f00\u53d1\u8fd8\u5728\u57fa\u4e8e\u574f\u4ee3\u7801\u7ee7\u7eed\u5e72\u6d3b&#xff0c;\u7b49\u4e8e\u4f60 rollback \u4e86\u7ebf\u4e0a\u3001\u4ed6\u4eec\u53c8\u7ed9\u63a8\u56de\u53bb\u4e86\u3002<\/p>\n<p>\u8fd8\u8bb0\u5f97\u5f00\u5934\u5c0f\u674e\u7684 force push \u5417&#xff1f;\u73b0\u5728 master \u6709\u5206\u652f\u4fdd\u62a4\u30012 \u4eba Approve\u3001\u4e0d\u53ef\u8986\u76d6\u7684 Tag&#xff0c;\u4ed6\u60f3 force push \u4e5f\u5f97\u5148\u8fc7\u4e24\u9053\u5ba1&#xff0c;\u90a3\u79cd\u4e8b\u6545\u5728\u7269\u7406\u4e0a\u5df2\u7ecf\u4e0d\u53ef\u80fd\u53d1\u751f\u3002\u5c0f\u674e\u73b0\u5728\u65e9\u5c31\u8001\u5b9e\u4e86\u3002<\/p>\n<hr \/>\n<h4>\u4e09.\u5168\u7a0b\u4e00\u56fe\u6d41<\/h4>\n<p><img decoding=\"async\" src=\"https:\/\/www.wsisp.com\/helps\/wp-content\/uploads\/2026\/09\/20260905014214-6a9b73763a0c0.png\" alt=\"\u5168\u7a0b\u4e00\u56fe\u6d41\" \/><\/p>\n<hr \/>\n<h4>\u56db.\u4e94\u5f20\u901f\u67e5\u8868&#xff08;\u6253\u5370\u8d34\u5899\u7248&#xff09;<\/h4>\n<h3>\u88681&#xff1a;\u5206\u652f\u4ece\u54ea\u6765\u3001\u5230\u54ea\u53bb<\/h3>\n<table>\n<tr>\u5206\u652f\u4ece\u54ea\u62c9\u5408\u5230\u54ea\u4e00\u53e5\u8bdd<\/tr>\n<tbody>\n<tr>\n<td>feature-*<\/td>\n<td>sprint<\/td>\n<td>sprint<\/td>\n<td>\u6211\u7684\u529f\u80fd\u6211\u505a\u4e3b<\/td>\n<\/tr>\n<tr>\n<td>sprint-*<\/td>\n<td>develop<\/td>\n<td>develop<\/td>\n<td>\u4e00\u8fed\u4ee3\u4e00\u6536\u53e3<\/td>\n<\/tr>\n<tr>\n<td>bugfix-*<\/td>\n<td>sprint\/release<\/td>\n<td>\u539f\u5730<\/td>\n<td>\u63d0\u6d4b bug \u4e13\u7528<\/td>\n<\/tr>\n<tr>\n<td>release-*<\/td>\n<td>develop<\/td>\n<td>master&#043;develop<\/td>\n<td>\u53d1\u5e03\u524d\u7684\u9694\u79bb\u75c5\u623f<\/td>\n<\/tr>\n<tr>\n<td>hotfix-*<\/td>\n<td>master<\/td>\n<td>master&#043;develop<\/td>\n<td>\u7ebf\u4e0a\u6551\u706b\u961f<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<h3>\u88682&#xff1a;\u5408\u5e76\u65b9\u5f0f\u600e\u4e48\u9009<\/h3>\n<table>\n<tr>\u573a\u666f\u65b9\u5f0f\u8bb0\u5fc6\u53e3\u8bc0<\/tr>\n<tbody>\n<tr>\n<td>feature\/bugfix \u5408\u5165<\/td>\n<td>Squash<\/td>\n<td>\u4e2a\u4eba\u5206\u652f\u538b\u6241<\/td>\n<\/tr>\n<tr>\n<td>sprint\/release\/hotfix \u5408\u5165<\/td>\n<td>\u2013no-ff<\/td>\n<td>\u91cc\u7a0b\u7891\u7559\u75d5<\/td>\n<\/tr>\n<tr>\n<td>\u540c\u6b65\u6700\u65b0\u4ee3\u7801<\/td>\n<td>Rebase<\/td>\n<td>\u642c\u5bb6\u4fdd\u6301\u7ebf\u6027<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<h3>\u88683&#xff1a;\u7248\u672c\u53f7\u4ec0\u4e48\u65f6\u5019\u53d8<\/h3>\n<table>\n<tr>\u65f6\u673a\u53d8\u5316\u4f8b\u5b50<\/tr>\n<tbody>\n<tr>\n<td>\u5207 release \u65f6<\/td>\n<td>\u5b9a\u4e0b\u672c\u6b21\u7248\u672c<\/td>\n<td>2.0.0 \u2192 2.1.0<\/td>\n<\/tr>\n<tr>\n<td>\u5207 hotfix \u65f6<\/td>\n<td>PATCH &#043;1<\/td>\n<td>2.1.0 \u2192 2.1.1<\/td>\n<\/tr>\n<tr>\n<td>\u5176\u4ed6\u4efb\u4f55\u65f6\u5019<\/td>\n<td>\u4e0d\u8bb8\u52a8<\/td>\n<td>\u2014<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<h3>\u88684&#xff1a;Commit Message \u6284\u4f5c\u4e1a<\/h3>\n<p>feat(pay): add WeChat Pay v3 API support<br \/>\nfix(pay): correct rounding precision for amount<br \/>\nfix(pay): increase payment gateway timeout to 10s<br \/>\ndocs(readme): update deployment guide<br \/>\nrefactor(user): extract login service from controller<\/p>\n<p>\u89c4\u5219&#xff1a;type(scope) \u7528\u52a8\u8bcd\u5f00\u5934\u82f1\u6587\u5c0f\u5199\u63cf\u8ff0&#xff0c;\u4e0d\u8d85\u8fc7 72 \u5b57\u7b26&#xff0c;\u7ed3\u5c3e\u4e0d\u52a0\u53e5\u53f7&#xff1b;BREAKING CHANGE \u5168\u5927\u5199\u5199 footer\u3002\u914d\u5957\u5de5\u5177\u4e09\u4ef6\u5957 commitlint\u3001husky\u3001standard-version&#xff0c;\u683c\u5f0f\u95ee\u9898\u4ece\u6b64\u6d88\u5931&#xff0c;\u518d\u4e5f\u6ca1\u4eba\u8ddf\u4f60\u5435 commit \u8be5\u5199\u6210\u5565\u6837\u3002<\/p>\n<h3>\u88685&#xff1a;\u73af\u5883\u4e0e\u5ba1\u6279\u95e8\u69db<\/h3>\n<table>\n<tr>\u73af\u5883\u90e8\u7f72\u65b9\u5f0f\u6765\u6e90\u5ba1\u6279<\/tr>\n<tbody>\n<tr>\n<td>TEST<\/td>\n<td>\u6e90\u7801\u7f16\u8bd1<\/td>\n<td>sprint\/release\/develop<\/td>\n<td>1 \u4eba Approve<\/td>\n<\/tr>\n<tr>\n<td>PROD<\/td>\n<td>Docker \u955c\u50cf&#xff08;\u624b\u52a8\u89e6\u53d1&#xff09;<\/td>\n<td>\u4ec5 master \u6b63\u5f0f\u955c\u50cf<\/td>\n<td>2 \u4eba Approve<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<p>TEST \u8d44\u6e90\u51b2\u7a81\u65f6\u4f18\u5148\u7ea7\u662f hotfix \u5927\u4e8e release \u5927\u4e8e develop \u5927\u4e8e sprint&#xff0c;\u7ebf\u4e0a\u6545\u969c\u6c38\u8fdc\u6392\u7b2c\u4e00&#xff0c;\u8fd9\u4e2a\u6ca1\u5f97\u5546\u91cf\u3002<\/p>\n<hr \/>\n<h4>\u4e94.\u4e94\u6761\u7ea2\u7ebf&#xff0c;\u4e00\u6761\u90fd\u522b\u8e29<\/h4>\n<li>git push &#8211;force \u5230\u516c\u5171\u5206\u652f&#xff0c;\u8fd9\u5c31\u662f\u5f00\u5934\u90a3\u6b21\u4e8b\u6545\u7684\u6839&#xff0c;\u76f4\u63a5\u6bc1\u6389\u522b\u4eba\u5386\u53f2\u3002\u8e29\u8fd9\u6761\u6211\u5f53\u573a\u5c31\u60f3\u6536\u4ed6\u5206\u652f\u6743\u9650\u3002<\/li>\n<li>\u76f4\u63a5\u5728 master\/develop \u4e0a commit&#xff0c;\u6240\u6709\u4fdd\u62a4\u5168\u7ed5\u8fc7\u53bb\u4e86&#xff0c;\u7b49\u4e8e\u5bb6\u95e8\u6ca1\u9501\u3002<\/li>\n<li>\u8df3\u8fc7 Code Review \u76f4\u63a5\u5408\u5e76&#xff0c;\u8d28\u91cf\u7b49\u4e8e\u88f8\u5954&#xff0c;\u51fa\u95ee\u9898\u8c01\u90fd\u6551\u4e0d\u4e86\u4f60\u3002<\/li>\n<li>SNAPSHOT \u4f9d\u8d56\u8fdb master&#xff0c;\u4e0a\u7ebf\u540e\u6839\u672c\u6ca1\u6cd5\u590d\u73b0&#xff0c;\u534a\u591c\u88ab\u53eb\u8d77\u6765\u4f60\u54ed\u90fd\u627e\u4e0d\u7740\u539f\u56e0\u3002<\/li>\n<li>\u56de\u6eda\u540e\u4e0d\u901a\u77e5\u56e2\u961f&#xff0c;\u8fd9\u662f\u534f\u4f5c\u707e\u96be&#xff0c;\u522b\u4eba\u8fd8\u4ee5\u4e3a\u7ebf\u4e0a\u597d\u597d\u7684\u7ee7\u7eed\u5806\u4ee3\u7801\u3002<\/li>\n<h4>&#x1f348;\u731c\u4f60\u60f3\u95ee<\/h4>\n<h5>\u5982\u4f55\u4e0e\u72d7\u54e5\u8054\u7cfb\u8fdb\u884c\u63a2\u8ba8&#xff1f;<\/h5>\n<p>\u5173\u6ce8\u516c\u4f17\u53f7\u3010JavaDog\u7a0b\u5e8f\u72d7\u3011&#xff0c;\u56de\u590d\u3010\u5165\u7fa4\u3011\u6216\u3010\u52a0\u5165\u3011&#xff0c;\u4e00\u8d77\u804a\u6280\u672f\u3001\u804a\u8e29\u5751\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u524d\u8a00<br \/>\n&#x1f34a;\u7f18\u7531<br \/>\n\u51cc\u66682\u70b9&#xff0c;\u4e00\u6b21 force push \u5f15\u53d1\u7684\u8840\u6848 \u90a3\u5929\u51cc\u6668 2 \u70b9&#xff0c;\u5c0f\u674e\u4e00\u6761 git push &#8211;force&#xff0c;\u628a master \u4e0a\u4e09\u5929\u7684\u63d0\u4ea4\u5386\u53f2\u62b9\u5f97\u5e72\u5e72\u51c0\u51c0\u3002 \u6ca1\u4eba\u77e5\u9053\u7ebf\u4e0a\u4ee3\u7801\u5bf9\u5e94\u54ea\u4e2a commit&#xff0c;\u6ca1\u4eba\u6562\u53d1\u5e03&#xff0c;\u9886\u5bfc\u5728\u7fa4\u91cc\u7529\u4e86\u4e00\u4e2a\u5b57&#xff1a;\u67e5\u3002 \u4e8b\u540e\u590d\u76d8&#xff0c;\u9886\u5bfc\u5199\u4e0b\u4e00\u4efd\u56e2\u961f Git \u89c4\u8303\u3002\u4eca\u5929\u5168\u6587\u516c\u5f00&#xff0c;\u53ea\u8981\u56e2\u961f\u8d85\u8fc7 3 \u4e2a\u4eba&amp;#xff0c<\/p>\n","protected":false},"author":2,"featured_media":100771,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[89,2122],"topic":[],"class_list":["post-100776","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-server","tag-git","tag-2122"],"yoast_head":"<!-- This site is optimized with the Yoast SEO plugin v20.3 - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>\u3010\u89c4\u8303\u3011\u8fd9\u5957 Git \u89c4\u8303\uff0c\u6551\u4e86\u6574\u4e2a\u56e2\u961f - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.wsisp.com\/helps\/100776.html\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u3010\u89c4\u8303\u3011\u8fd9\u5957 Git \u89c4\u8303\uff0c\u6551\u4e86\u6574\u4e2a\u56e2\u961f - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\" \/>\n<meta property=\"og:description\" content=\"\u524d\u8a00 &#x1f34a;\u7f18\u7531 \u51cc\u66682\u70b9&#xff0c;\u4e00\u6b21 force push \u5f15\u53d1\u7684\u8840\u6848 \u90a3\u5929\u51cc\u6668 2 \u70b9&#xff0c;\u5c0f\u674e\u4e00\u6761 git push --force&#xff0c;\u628a master \u4e0a\u4e09\u5929\u7684\u63d0\u4ea4\u5386\u53f2\u62b9\u5f97\u5e72\u5e72\u51c0\u51c0\u3002 \u6ca1\u4eba\u77e5\u9053\u7ebf\u4e0a\u4ee3\u7801\u5bf9\u5e94\u54ea\u4e2a commit&#xff0c;\u6ca1\u4eba\u6562\u53d1\u5e03&#xff0c;\u9886\u5bfc\u5728\u7fa4\u91cc\u7529\u4e86\u4e00\u4e2a\u5b57&#xff1a;\u67e5\u3002 \u4e8b\u540e\u590d\u76d8&#xff0c;\u9886\u5bfc\u5199\u4e0b\u4e00\u4efd\u56e2\u961f Git \u89c4\u8303\u3002\u4eca\u5929\u5168\u6587\u516c\u5f00&#xff0c;\u53ea\u8981\u56e2\u961f\u8d85\u8fc7 3 \u4e2a\u4eba&amp;#xff0c\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.wsisp.com\/helps\/100776.html\" \/>\n<meta property=\"og:site_name\" content=\"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\" \/>\n<meta property=\"article:published_time\" content=\"2026-09-05T01:42:15+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/www.wsisp.com\/helps\/wp-content\/uploads\/2026\/09\/20260905014210-6a9b7372823f9.png\" \/>\n<meta name=\"author\" content=\"admin\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"admin\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"5 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/100776.html\",\"url\":\"https:\/\/www.wsisp.com\/helps\/100776.html\",\"name\":\"\u3010\u89c4\u8303\u3011\u8fd9\u5957 Git \u89c4\u8303\uff0c\u6551\u4e86\u6574\u4e2a\u56e2\u961f - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\",\"isPartOf\":{\"@id\":\"https:\/\/www.wsisp.com\/helps\/#website\"},\"datePublished\":\"2026-09-05T01:42:15+00:00\",\"dateModified\":\"2026-09-05T01:42:15+00:00\",\"author\":{\"@id\":\"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.wsisp.com\/helps\/100776.html#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.wsisp.com\/helps\/100776.html\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/100776.html#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.wsisp.com\/helps\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u3010\u89c4\u8303\u3011\u8fd9\u5957 Git \u89c4\u8303\uff0c\u6551\u4e86\u6574\u4e2a\u56e2\u961f\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/#website\",\"url\":\"https:\/\/www.wsisp.com\/helps\/\",\"name\":\"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\",\"description\":\"\u9999\u6e2f\u670d\u52a1\u5668_\u9999\u6e2f\u4e91\u670d\u52a1\u5668\u8d44\u8baf_\u670d\u52a1\u5668\u5e2e\u52a9\u6587\u6863_\u670d\u52a1\u5668\u6559\u7a0b\",\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\/\/www.wsisp.com\/helps\/?s={search_term_string}\"},\"query-input\":\"required name=search_term_string\"}],\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41\",\"name\":\"admin\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/gravatar.wp-china-yes.net\/avatar\/?s=96&d=mystery\",\"contentUrl\":\"https:\/\/gravatar.wp-china-yes.net\/avatar\/?s=96&d=mystery\",\"caption\":\"admin\"},\"sameAs\":[\"http:\/\/wp.wsisp.com\"],\"url\":\"https:\/\/www.wsisp.com\/helps\/author\/admin\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"\u3010\u89c4\u8303\u3011\u8fd9\u5957 Git \u89c4\u8303\uff0c\u6551\u4e86\u6574\u4e2a\u56e2\u961f - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.wsisp.com\/helps\/100776.html","og_locale":"zh_CN","og_type":"article","og_title":"\u3010\u89c4\u8303\u3011\u8fd9\u5957 Git \u89c4\u8303\uff0c\u6551\u4e86\u6574\u4e2a\u56e2\u961f - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","og_description":"\u524d\u8a00 &#x1f34a;\u7f18\u7531 \u51cc\u66682\u70b9&#xff0c;\u4e00\u6b21 force push \u5f15\u53d1\u7684\u8840\u6848 \u90a3\u5929\u51cc\u6668 2 \u70b9&#xff0c;\u5c0f\u674e\u4e00\u6761 git push --force&#xff0c;\u628a master \u4e0a\u4e09\u5929\u7684\u63d0\u4ea4\u5386\u53f2\u62b9\u5f97\u5e72\u5e72\u51c0\u51c0\u3002 \u6ca1\u4eba\u77e5\u9053\u7ebf\u4e0a\u4ee3\u7801\u5bf9\u5e94\u54ea\u4e2a commit&#xff0c;\u6ca1\u4eba\u6562\u53d1\u5e03&#xff0c;\u9886\u5bfc\u5728\u7fa4\u91cc\u7529\u4e86\u4e00\u4e2a\u5b57&#xff1a;\u67e5\u3002 \u4e8b\u540e\u590d\u76d8&#xff0c;\u9886\u5bfc\u5199\u4e0b\u4e00\u4efd\u56e2\u961f Git \u89c4\u8303\u3002\u4eca\u5929\u5168\u6587\u516c\u5f00&#xff0c;\u53ea\u8981\u56e2\u961f\u8d85\u8fc7 3 \u4e2a\u4eba&amp;#xff0c","og_url":"https:\/\/www.wsisp.com\/helps\/100776.html","og_site_name":"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","article_published_time":"2026-09-05T01:42:15+00:00","og_image":[{"url":"https:\/\/www.wsisp.com\/helps\/wp-content\/uploads\/2026\/09\/20260905014210-6a9b7372823f9.png"}],"author":"admin","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"admin","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"5 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.wsisp.com\/helps\/100776.html","url":"https:\/\/www.wsisp.com\/helps\/100776.html","name":"\u3010\u89c4\u8303\u3011\u8fd9\u5957 Git \u89c4\u8303\uff0c\u6551\u4e86\u6574\u4e2a\u56e2\u961f - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","isPartOf":{"@id":"https:\/\/www.wsisp.com\/helps\/#website"},"datePublished":"2026-09-05T01:42:15+00:00","dateModified":"2026-09-05T01:42:15+00:00","author":{"@id":"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41"},"breadcrumb":{"@id":"https:\/\/www.wsisp.com\/helps\/100776.html#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.wsisp.com\/helps\/100776.html"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.wsisp.com\/helps\/100776.html#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.wsisp.com\/helps"},{"@type":"ListItem","position":2,"name":"\u3010\u89c4\u8303\u3011\u8fd9\u5957 Git \u89c4\u8303\uff0c\u6551\u4e86\u6574\u4e2a\u56e2\u961f"}]},{"@type":"WebSite","@id":"https:\/\/www.wsisp.com\/helps\/#website","url":"https:\/\/www.wsisp.com\/helps\/","name":"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","description":"\u9999\u6e2f\u670d\u52a1\u5668_\u9999\u6e2f\u4e91\u670d\u52a1\u5668\u8d44\u8baf_\u670d\u52a1\u5668\u5e2e\u52a9\u6587\u6863_\u670d\u52a1\u5668\u6559\u7a0b","potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/www.wsisp.com\/helps\/?s={search_term_string}"},"query-input":"required name=search_term_string"}],"inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41","name":"admin","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/image\/","url":"https:\/\/gravatar.wp-china-yes.net\/avatar\/?s=96&d=mystery","contentUrl":"https:\/\/gravatar.wp-china-yes.net\/avatar\/?s=96&d=mystery","caption":"admin"},"sameAs":["http:\/\/wp.wsisp.com"],"url":"https:\/\/www.wsisp.com\/helps\/author\/admin"}]}},"_links":{"self":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/posts\/100776","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/comments?post=100776"}],"version-history":[{"count":0,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/posts\/100776\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/media\/100771"}],"wp:attachment":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/media?parent=100776"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/categories?post=100776"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/tags?post=100776"},{"taxonomy":"topic","embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/topic?post=100776"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}