{"id":224,"date":"2026-02-13T15:51:59","date_gmt":"2026-02-13T07:51:59","guid":{"rendered":"https:\/\/www.tanime.life\/?p=224"},"modified":"2026-02-13T15:52:00","modified_gmt":"2026-02-13T07:52:00","slug":"%e5%85%b3%e4%ba%8egit-merge","status":"publish","type":"post","link":"https:\/\/www.tanime.life\/index.php\/2026\/02\/13\/%e5%85%b3%e4%ba%8egit-merge\/","title":{"rendered":"\u5173\u4e8egit merge"},"content":{"rendered":"\n<p class=\"wp-block-paragraph\">\u5728\u56e2\u961f\u534f\u4f5c\u4e2d\uff0c\u6211\u4eec\u53ef\u80fd\u4f1a\u4f7f\u7528\u5230git flow\uff0c\u6216\u8005\u7c7b\u5de5\u4f5c\u6a21\u5f0f\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u800c\u7b14\u8005\u5173\u4e8e\u5bf9feature\u548cdevelop\u7684\u5206\u652f\u7406\u89e3\u6709\u4e9b\u8bb8\u7684\u56f0\u60d1\uff0c\u7ecf\u8fc7\u67e5\u8be2\u5927\u6982\u7406\u89e3\u3002<\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h3 class=\"wp-block-heading\">feature<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">feature\u7684\u4f5c\u7528\u5c31\u662f\u5bf9\u4f60\u60f3\u8981\u8fdb\u884c\u5f00\u53d1\u7684\u529f\u80fd\uff0c\u8fdb\u884c\u4e00\u4e2a\u4e0d\u65ad\u7684\u5f00\u53d1\uff0c\u6d4b\u8bd5&#8230;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">feature\u4e0a\u5f00\u53d1\u7684\u5206\u652f\uff0c\u4e00\u65e6\u5f00\u53d1\u5b8c\u6bd5\uff0c\u5408\u5e76\u5230develop\u4e0a\uff0c\u5c31\u8981\u88ab\u5220\u9664\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">develop<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">develop\u5219\u662f\u96c6\u6210\u529f\u80fd\u5206\u652f\uff0c\u5c06\u591a\u4e2afeature\u4e0a\u7684\u529f\u80fd\u5408\u5e76\u5230develop\u4e0a\uff0cdevelop\u5448\u73b0\u7684\u662f\u4e00\u4e2a\u76ee\u524d\u7248\u672c\u6765\u8bf4\uff0c\u529f\u80fd\u5f00\u53d1\u76f8\u5bf9\u5b8c\u6574\u7684\u5206\u652f\uff0c\u81f3\u4e8e\u540e\u7eed\uff0c\u53ef\u80fd\u8fd8\u4f1a\u6709bugfix\uff0crelease\uff0c\u7b49\u7b49\u5206\u652f\uff0c\u6765\u7ee7\u7eed\u5bf9develop\u4e0a\u7684\u529f\u80fd\u8fdb\u884c\u5904\u7406\uff0c\u8fd9\u91cc\u4e0d\u518d\u6df1\u7a76\u3002<\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h3 class=\"wp-block-heading\">\u5173\u4e8e\u5c06feature\u5408\u5e76\u5230develop<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u7b14\u8005\u770b\u6765\uff0c\u5408\u5e76\u65e0\u975e\u662f<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git switch develop\ngit merge feature\/xx<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">\u5b9e\u9645\u60c5\u51b5\u5374\u662f\u8fd9\u6837\u7684<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git switch develop\ngit merge --no-ff feature\/xx -m \"release: \u5408\u5e76xx\u529f\u80fd\"<\/code><\/pre>\n\n\n\n<h4 class=\"wp-block-heading\">\u5173\u4e8e &#8211;no-ff<\/h4>\n\n\n\n<p class=\"wp-block-paragraph\">\u5982\u4f55\u7406\u89e3&#8211;no-ff\u5462\uff0c\u7b80\u5355\u4e00\u53e5\u8bdd\u7406\u89e3\u5c31\u662f\u975e\u5feb\u8fdb\u5408\u5e76\u3002\u5bf9\u4e8e\u76f4\u63a5\u7684git merge \u5c31\u662f\u5feb\u8fdb\u5408\u5e76\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><code>--no-ff<\/code>\u00a0\u9009\u9879\uff0c\u662f Git \u5408\u5e76\u65f6<strong>\u5f3a\u5236\u7981\u6b62\u5feb\u8fdb\u5f0f\u5408\u5e76<\/strong>\u7684\u6807\u5fd7\u3002<\/p>\n\n\n\n<h4 class=\"wp-block-heading\">\u5177\u4f53\u4f5c\u7528<\/h4>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>\u5f3a\u5236\u521b\u5efa\u5408\u5e76\u63d0\u4ea4<\/strong>\uff0c\u5373\u4f7f\u00a0<code>develop<\/code>\u00a0\u6ca1\u6709\u65b0\u63d0\u4ea4\uff0c\u4e5f\u4f1a\u751f\u6210\u4e00\u4e2a\u63d0\u4ea4\u5bf9\u8c61\uff08commit\uff09\uff0c\u5176\u7236\u63d0\u4ea4\u6709\u4e24\u4e2a\uff1a<code>develop<\/code>\u00a0\u539f\u6765\u7684\u6700\u65b0\u63d0\u4ea4\u548c\u00a0<code>feature<\/code>\u00a0\u7684\u6700\u65b0\u63d0\u4ea4\u3002<\/li>\n\n\n\n<li>\u8fd9\u4e2a\u5408\u5e76\u63d0\u4ea4<strong>\u5305\u542b\u4e86\u6574\u4e2a feature \u5206\u652f\u7684\u6539\u52a8<\/strong>\uff0c\u5e76\u4e14<strong>\u660e\u786e\u8bb0\u5f55\u4e86\u201c\u8fd9\u662f\u4e00\u4e2a\u529f\u80fd\u5408\u5e76\u4e8b\u4ef6\u201d<\/strong>\u3002<\/li>\n\n\n\n<li>\u53ef\u4ee5\u901a\u8fc7\u00a0<code>-m<\/code>\u00a0\u4e3a\u8fd9\u4e2a\u5408\u5e76\u63d0\u4ea4<strong>\u6307\u5b9a\u63d0\u4ea4\u4fe1\u606f<\/strong>\uff08\u5982\u00a0<code>\"release: \u5408\u5e76\u7528\u6237\u79ef\u5206\u7cfb\u7edf\u529f\u80fd\"<\/code>\uff09\uff0c\u65b9\u4fbf\u65e5\u540e\u9605\u8bfb\u3002<\/li>\n<\/ul>\n\n\n\n<h4 class=\"wp-block-heading\">\u5feb\u8fdb\u5408\u5e76 vs \u975e\u5feb\u8fdb\u5408\u5e76<\/h4>\n\n\n\n<h5 class=\"wp-block-heading\">\u5feb\u8fdb\u5408\u5e76<\/h5>\n\n\n\n<p class=\"wp-block-paragraph\">\u5f53\u00a0<code>develop<\/code>\u00a0\u5206\u652f\u81ea\u00a0<code>feature<\/code>\u00a0\u5206\u652f\u521b\u5efa\u540e<strong>\u6ca1\u6709\u4ea7\u751f\u65b0\u7684\u63d0\u4ea4<\/strong>\uff0c<code>develop<\/code>\u00a0\u7684\u6307\u9488\u76f4\u63a5<strong>\u5411\u524d\u79fb\u52a8<\/strong>\u5230\u00a0<code>feature<\/code>\u00a0\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\u3002<br><strong>\u6ca1\u6709\u989d\u5916\u7684\u5408\u5e76\u63d0\u4ea4<\/strong>\uff0c\u5386\u53f2\u662f\u4e00\u6761\u76f4\u7ebf\u3002<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>\u5408\u5e76\u524d\uff1a\n      A---B---C  feature\n     \/\nD---E           develop\n\n\u5408\u5e76\u540e\uff08fast-forward\uff09\uff1a\n      A---B---C  develop, feature\n     \/\nD---E<\/code><\/pre>\n\n\n\n<h5 class=\"wp-block-heading\">\u975e\u5feb\u8fdb\u5408\u5e76<\/h5>\n\n\n\n<p class=\"wp-block-paragraph\">\u65e0\u8bba\u00a0<code>develop<\/code>\u00a0\u662f\u5426\u6709\u65b0\u63d0\u4ea4\uff0cGit \u90fd<strong>\u5f3a\u5236\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5408\u5e76\u63d0\u4ea4<\/strong>\uff0c\u5c06\u4e24\u4e2a\u5206\u652f\u7684\u5386\u53f2\u8fde\u63a5\u5728\u4e00\u8d77\u3002<br>\u5373\u4f7f\u53ef\u4ee5\u8fdb\u884c\u5feb\u8fdb\uff0c\u4e5f\u4f1a\u751f\u6210\u4e00\u4e2a<strong>\u5408\u5e76\u8282\u70b9<\/strong>\u3002<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>\u5408\u5e76\u524d\uff1a\n      A---B---C  feature\n     \/\nD---E           develop\n\n\u5408\u5e76\u540e\uff08--no-ff\uff09\uff1a\n      A---B---C  feature\n     \/         \\\nD---E-----------F  develop  (F\u4e3a\u5408\u5e76\u63d0\u4ea4)<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\"><\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u5728\u56e2\u961f\u534f\u4f5c\u4e2d\uff0c\u6211\u4eec\u53ef\u80fd\u4f1a\u4f7f\u7528\u5230git flow\uff0c\u6216\u8005\u7c7b\u5de5\u4f5c\u6a21\u5f0f\u3002 \u800c\u7b14\u8005\u5173\u4e8e\u5bf9feature\u548cdevelop\u7684 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[20],"class_list":["post-224","post","type-post","status-publish","format-standard","hentry","category-techsharing","tag-git"],"_links":{"self":[{"href":"https:\/\/www.tanime.life\/index.php\/wp-json\/wp\/v2\/posts\/224","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.tanime.life\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.tanime.life\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.tanime.life\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.tanime.life\/index.php\/wp-json\/wp\/v2\/comments?post=224"}],"version-history":[{"count":1,"href":"https:\/\/www.tanime.life\/index.php\/wp-json\/wp\/v2\/posts\/224\/revisions"}],"predecessor-version":[{"id":225,"href":"https:\/\/www.tanime.life\/index.php\/wp-json\/wp\/v2\/posts\/224\/revisions\/225"}],"wp:attachment":[{"href":"https:\/\/www.tanime.life\/index.php\/wp-json\/wp\/v2\/media?parent=224"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.tanime.life\/index.php\/wp-json\/wp\/v2\/categories?post=224"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.tanime.life\/index.php\/wp-json\/wp\/v2\/tags?post=224"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}