{"id":121897,"date":"2026-11-03T23:48:48","date_gmt":"2026-11-03T15:48:48","guid":{"rendered":"https:\/\/www.wsisp.com\/helps\/121897.html"},"modified":"2026-11-03T23:48:48","modified_gmt":"2026-11-03T15:48:48","slug":"git-pull-%e4%ba%a7%e7%94%9f-merge-branch-%e6%8f%90%e4%ba%a4%ef%bc%9fgerrit-%e5%b7%a5%e4%bd%9c%e6%b5%81%e4%b8%8b%e7%9a%84%e5%8e%9f%e7%90%86%e3%80%81%e4%bf%ae%e5%a4%8d%e4%b8%8e","status":"publish","type":"post","link":"https:\/\/www.wsisp.com\/helps\/121897.html","title":{"rendered":"git pull \u4ea7\u751f \u201cMerge branch\u201d \u63d0\u4ea4\uff1fGerrit \u5de5\u4f5c\u6d41\u4e0b\u7684\u539f\u7406\u3001\u4fee\u590d\u4e0e\u6700\u4f73\u5b9e\u8df5"},"content":{"rendered":"<p>        \/* MD \/ \u5bcc\u6587\u672c\u4e2d\u7684 .toc\uff08\u542b\u535a\u5ba2\u56ed\u642c\u5bb6\u7b49\u5d4c\u5957\u7ed3\u6784\uff09\uff1b.toc-box \u5728\u4fa7\u680f\uff0c\u4e0d\u53d7\u5f71\u54cd *\/<br \/>\n        #content_views .toc,<br \/>\n        \/* \u7f16\u8f91\u5668\u5e38\u5728\u76ee\u5f55\u524d\u540e\u63d2\u5165\u7a7a p\uff08:empty \u4ecd\u5360 20px\uff09\uff0c\u4e00\u5e76\u53bb\u6389\u907f\u514d\u9876\u7a7a\u9699 *\/<br \/>\n        #content_views.markdown_views &gt; p:empty:has(+ .toc),<br \/>\n        #content_views.markdown_views &gt; .toc + p:empty,<br \/>\n        \/* \u5bcc\u6587\u672c\u65e7\u7248\u76ee\u5f55\u6807\u8bb0 *\/<br \/>\n        #content_views.htmledit_views #main-toc,<br \/>\n        #content_views.htmledit_views #hr-toc,<br \/>\n        #content_views.htmledit_views p[id*=\\&#8221;-toc\\&#8221;] {<br \/>\n          display: none !important;<br \/>\n        }<br \/>\n        \/* \u76ee\u5f55\u53bb\u6389\u540e\uff0c\u7d27\u8ddf\u7684\u9996\u4e2a\u6807\u9898\u4e0d\u518d\u591a\u51fa\u4e00\u5757\u4e0a\u8fb9\u8ddd *\/<br \/>\n        #content_views.markdown_views &gt; .toc + h1,<br \/>\n        #content_views.markdown_views &gt; .toc + h2,<br \/>\n        #content_views.markdown_views &gt; .toc + h3,<br \/>\n        #content_views.markdown_views &gt; .toc + h4,<br \/>\n        #content_views.markdown_views &gt; .toc + p:empty + h1,<br \/>\n        #content_views.markdown_views &gt; .toc + p:empty + h2,<br \/>\n        #content_views.markdown_views &gt; .toc + p:empty + h3,<br \/>\n        #content_views.markdown_views &gt; .toc + p:empty + h4 {<br \/>\n          margin-top: 0 !important;<br \/>\n        }<\/p>\n<p>\u573a\u666f&#xff1a;\u5728\u672c\u5730 Gerrit \u5de5\u7a0b\u7684 xxx1 \u5206\u652f\u6267\u884c git pull origin xxx1 \u540e&#xff0c;\u63d0\u4ea4\u5386\u53f2\u4e2d\u591a\u51fa\u4e00\u4e2a Merge branch &#039;xxx1&#039; of &#8230; into xxx1 \u7684\u63d0\u4ea4&#xff0c;\u770b\u8d77\u6765\u50cf\u4e00\u6b21\u201c\u7a7a\u63d0\u4ea4\u201d\u3002\u672c\u6587\u4ece Git \u539f\u7406\u548c Gerrit \u8bc4\u5ba1\u6d41\u7a0b\u4e24\u4e2a\u89d2\u5ea6&#xff0c;\u89e3\u91ca\u5b83\u4e3a\u4ec0\u4e48\u4f1a\u51fa\u73b0\u3001\u4e3a\u4ec0\u4e48\u5728 Gerrit \u4e2d\u901a\u5e38\u8981\u5c3d\u91cf\u907f\u514d&#xff0c;\u4ee5\u53ca\u5982\u4f55\u4fee\u590d\u548c\u9884\u9632\u3002<\/p>\n<h3>\u6838\u5fc3\u8981\u70b9<\/h3>\n<ul>\n<li>git pull \u672c\u8d28\u4e0a\u662f git fetch &#043; git merge \u7684\u7ec4\u5408\u3002<\/li>\n<li>\u5f53\u672c\u5730\u5206\u652f\u548c\u8fdc\u7aef\u5206\u652f\u53d1\u751f\u5206\u53c9\u65f6&#xff0c;\u9ed8\u8ba4 merge \u7b56\u7565\u4f1a\u751f\u6210\u4e00\u4e2a merge commit&#xff0c;\u63d0\u4ea4\u4fe1\u606f\u901a\u5e38\u4ee5 Merge branch &#8230; \u5f00\u5934\u3002<\/li>\n<li>\u8fd9\u4e2a\u63d0\u4ea4\u901a\u5e38\u4e0d\u643a\u5e26\u6587\u4ef6\u53d8\u66f4&#xff0c;\u4f46\u5b83\u5e76\u4e0d\u662f git commit &#8211;allow-empty \u610f\u4e49\u4e0a\u7684\u7a7a\u63d0\u4ea4&#xff0c;\u800c\u662f\u7528\u4e8e\u8fde\u63a5\u4e24\u6761\u5386\u53f2\u7ebf\u7684\u5408\u5e76\u63d0\u4ea4\u3002<\/li>\n<li>Gerrit \u9ed8\u8ba4\u901a\u5e38\u4e0d\u5141\u8bb8\u5c06 merge commit \u63a8\u9001\u5230 refs\/for\/&lt;branch&gt; \u8fdb\u884c\u8bc4\u5ba1&#xff0c;\u5e76\u4e14\u53ef\u80fd\u5e72\u6270 Change-Id \u7684\u8ffd\u8e2a\u3002<\/li>\n<li>\u5728 Gerrit \u7684\u4e2a\u4eba\u5f00\u53d1\u5206\u652f\u4e0a&#xff0c;\u66f4\u63a8\u8350\u4f7f\u7528 git pull &#8211;rebase origin xxx1&#xff0c;\u6216\u914d\u7f6e git config pull.rebase true\u3002<\/li>\n<li>\u5982\u679c\u5df2\u7ecf\u4ea7\u751f merge commit \u4e14\u5c1a\u672a\u63a8\u9001&#xff0c;\u53ef\u4ee5\u64a4\u9500\u540e\u6539\u7528 rebase&#xff1b;\u63a8\u9001\u524d\u5e94\u68c0\u67e5\u5386\u53f2\u662f\u5426\u7ebf\u6027\u3001Change-Id \u662f\u5426\u4fdd\u7559\u3002<\/li>\n<\/ul>\n<hr \/>\n<h3>1. \u73b0\u8c61&#xff1a;\u4e3a\u4ec0\u4e48 pull \u540e\u591a\u4e86\u4e00\u4e2a Merge branch \u63d0\u4ea4&#xff1f;<\/h3>\n<p>\u6267\u884c&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> pull origin xxx1<\/p>\n<p>\u7b49\u4ef7\u4e8e\u5148\u6293\u53d6\u8fdc\u7aef\u66f4\u65b0&#xff0c;\u518d\u5c1d\u8bd5\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> fetch origin xxx1<br \/>\n<span class=\"token function\">git<\/span> merge FETCH_HEAD<\/p>\n<p>\u5982\u679c\u6b64\u65f6\u6ee1\u8db3\u4ee5\u4e0b\u6761\u4ef6&#xff1a;<\/p>\n<ul>\n<li>\u672c\u5730 xxx1 \u6709\u8fdc\u7aef\u6ca1\u6709\u7684\u63d0\u4ea4&#xff0c;\u4f8b\u5982\u4f60\u4e4b\u524d\u5df2\u7ecf\u6267\u884c\u8fc7 commit&#xff1b;<\/li>\n<li>\u8fdc\u7aef xxx1 \u4e5f\u6709\u65b0\u7684\u63d0\u4ea4&#xff1b;<\/li>\n<\/ul>\n<p>\u90a3\u4e48\u4e24\u6761\u5386\u53f2\u7ebf\u5c31\u53d1\u751f\u4e86\u5206\u53c9&#xff08;diverged&#xff09;\u3002Git \u9ed8\u8ba4\u7684 merge \u7b56\u7565\u4f1a\u521b\u5efa\u4e00\u4e2a\u65b0\u7684 merge commit&#xff0c;\u628a\u4e24\u6761\u5386\u53f2\u8fde\u63a5\u8d77\u6765\u3002\u63d0\u4ea4\u4fe1\u606f\u901a\u5e38\u7c7b\u4f3c&#xff1a;<\/p>\n<p>Merge branch &#039;xxx1&#039; of ssh:\/\/gerrit.example.com\/project into xxx1<\/p>\n<p>\u8fd9\u4e2a\u63d0\u4ea4\u672c\u8eab\u53ef\u80fd\u6ca1\u6709\u6587\u4ef6\u5185\u5bb9\u53d8\u66f4&#xff0c;\u6240\u4ee5\u770b\u8d77\u6765\u50cf\u201c\u7a7a\u63d0\u4ea4\u201d\u3002\u4f46\u4e25\u683c\u6765\u8bf4&#xff0c;\u5b83\u662f merge commit&#xff0c;\u6709\u4e24\u4e2a\u7236\u63d0\u4ea4&#xff0c;\u5e76\u4e0d\u662f &#8211;allow-empty \u521b\u5efa\u7684\u7a7a\u63d0\u4ea4\u3002<\/p>\n<hr \/>\n<h3>2. git pull \u7684\u6838\u5fc3\u539f\u7406<\/h3>\n<p>git pull \u7684\u5173\u952e\u4e0d\u5728\u201c\u62c9\u53d6\u201d&#xff0c;\u800c\u5728\u201c\u6574\u5408\u201d\u3002\u6574\u5408\u65b9\u5f0f\u51b3\u5b9a\u4e86\u6700\u7ec8\u7684\u63d0\u4ea4\u5386\u53f2\u5f62\u6001\u3002<\/p>\n<table>\n<tr>\u573a\u666f\u9ed8\u8ba4\u884c\u4e3a\u7ed3\u679c<\/tr>\n<tbody>\n<tr>\n<td>\u672c\u5730\u6ca1\u6709\u72ec\u6709\u63d0\u4ea4&#xff0c;\u8fdc\u7aef\u6709\u65b0\u63d0\u4ea4<\/td>\n<td>Fast-forward<\/td>\n<td>\u672c\u5730\u6307\u9488\u76f4\u63a5\u524d\u79fb&#xff0c;\u4e0d\u4ea7\u751f\u989d\u5916\u63d0\u4ea4<\/td>\n<\/tr>\n<tr>\n<td>\u672c\u5730\u6709\u72ec\u6709\u63d0\u4ea4&#xff0c;\u8fdc\u7aef\u4e5f\u6709\u65b0\u63d0\u4ea4<\/td>\n<td>Recursive merge<\/td>\n<td>\u751f\u6210 merge commit&#xff0c;\u5386\u53f2\u5206\u53c9\u540e\u6c47\u5408<\/td>\n<\/tr>\n<tr>\n<td>\u4f7f\u7528 &#8211;rebase<\/td>\n<td>Fetch &#043; Rebase<\/td>\n<td>\u672c\u5730\u63d0\u4ea4\u91cd\u653e\u5230\u8fdc\u7aef\u6700\u65b0\u63d0\u4ea4\u4e4b\u540e&#xff0c;\u5386\u53f2\u4fdd\u6301\u7ebf\u6027<\/td>\n<\/tr>\n<tr>\n<td>\u4f7f\u7528 &#8211;ff-only<\/td>\n<td>\u4ec5\u5141\u8bb8\u5feb\u8fdb<\/td>\n<td>\u4e0d\u80fd\u5feb\u8fdb\u65f6\u76f4\u63a5\u62a5\u9519&#xff0c;\u4e0d\u81ea\u52a8\u5408\u5e76<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<h4>2.1 Fast-forward<\/h4>\n<p>\u5982\u679c\u672c\u5730 xxx1 \u662f\u8fdc\u7aef origin\/xxx1 \u7684\u7956\u5148&#xff0c;Git \u53ef\u4ee5\u76f4\u63a5\u5feb\u8fdb&#xff1a;<\/p>\n<p>A &#8212; B &#8212; C  (origin\/xxx1)<br \/>\n              \u2191<br \/>\n            \u672c\u5730 xxx1<\/p>\n<p>\u6267\u884c pull \u540e&#xff0c;\u672c\u5730\u5206\u652f\u76f4\u63a5\u6307\u5411 C&#xff0c;\u4e0d\u4f1a\u4ea7\u751f merge commit\u3002<\/p>\n<h4>2.2 \u5206\u53c9\u540e\u7684 Merge<\/h4>\n<p>\u5982\u679c\u672c\u5730\u6709\u63d0\u4ea4 L1&#xff0c;\u8fdc\u7aef\u6709\u63d0\u4ea4 R1&#xff1a;<\/p>\n<p>        L1  (\u672c\u5730 xxx1)<br \/>\n       \/<br \/>\nA &#8212; B<br \/>\n       \\\\<br \/>\n        R1  (origin\/xxx1)<\/p>\n<p>\u9ed8\u8ba4 git pull \u4f1a\u751f\u6210 merge commit M&#xff1a;<\/p>\n<p>        L1<br \/>\n       \/  \\\\<br \/>\nA &#8212; B    M  (HEAD)<br \/>\n       \\\\  \/<br \/>\n        R1<\/p>\n<p>M \u5c31\u662f Merge branch &#8230; \u63d0\u4ea4\u3002\u5b83\u53ef\u80fd\u6ca1\u6709\u5f15\u5165\u65b0\u7684\u6587\u4ef6\u5dee\u5f02&#xff0c;\u4f46\u6539\u53d8\u4e86\u63d0\u4ea4\u5386\u53f2\u7ed3\u6784\u3002<\/p>\n<h4>2.3 Rebase \u7684\u6574\u5408\u65b9\u5f0f<\/h4>\n<p>git pull &#8211;rebase \u4f1a\u5148\u628a\u672c\u5730\u63d0\u4ea4\u201c\u6458\u4e0b\u6765\u201d&#xff0c;\u518d\u628a\u5b83\u4eec\u4f9d\u6b21\u91cd\u653e\u5230\u8fdc\u7aef\u6700\u65b0\u63d0\u4ea4\u4e4b\u540e&#xff1a;<\/p>\n<p>A &#8212; B &#8212; R1 &#8212; L1&#039;<\/p>\n<p>\u8fd9\u6837\u5386\u53f2\u662f\u4e00\u6761\u76f4\u7ebf&#xff0c;\u4e0d\u4f1a\u4ea7\u751f merge commit\u3002\u6ce8\u610f L1 \u53d8\u6210\u4e86 L1&#039;&#xff0c;\u63d0\u4ea4 SHA \u4f1a\u6539\u53d8&#xff0c;\u4f46\u63d0\u4ea4\u4fe1\u606f\u5e95\u90e8\u7684 Change-Id \u5e94\u4fdd\u6301\u4e0d\u53d8\u3002<\/p>\n<hr \/>\n<h3>3. \u4e3a\u4ec0\u4e48 Gerrit \u5de5\u4f5c\u6d41\u5bf9 Merge commit \u654f\u611f&#xff1f;<\/h3>\n<p>Gerrit \u4e0d\u662f\u7b80\u5355\u7684 Git \u8fdc\u7aef&#xff0c;\u5b83\u56f4\u7ed5\u201c\u6bcf\u4e2a\u63d0\u4ea4\u5bf9\u5e94\u4e00\u4e2a Change\u201d\u7684\u8bc4\u5ba1\u6a21\u578b\u5de5\u4f5c\u3002\u81ea\u52a8 merge commit \u4f1a\u5e26\u6765\u4e24\u4e2a\u4e3b\u8981\u95ee\u9898\u3002<\/p>\n<h4>3.1 Gerrit \u901a\u5e38\u62d2\u6536\u63a8\u9001\u5230 refs\/for \u7684 merge commit<\/h4>\n<p>\u6b63\u5e38\u63a8\u9001\u8bc4\u5ba1\u4f7f\u7528&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> push origin HEAD:refs\/for\/xxx1<\/p>\n<p>Gerrit \u9ed8\u8ba4\u914d\u7f6e\u4e0b\u901a\u5e38\u4f1a\u62d2\u7edd\u5305\u542b merge commit \u7684\u63a8\u9001&#xff0c;\u63d0\u793a\u7c7b\u4f3c&#xff1a;<\/p>\n<p>! [remote rejected] HEAD -&gt; refs\/for\/xxx1<br \/>\n  (you are not allowed to upload merges)<\/p>\n<p>\u53ea\u6709\u9879\u76ee\u5728 project.config \u4e2d\u5bf9 refs\/for\/refs\/* \u663e\u5f0f\u6388\u4e88 pushMerge \u6743\u9650\u65f6&#xff0c;merge commit \u624d\u53ef\u80fd\u88ab\u63a5\u53d7\u3002\u4f46\u5728\u5e38\u89c4 Gerrit \u8bc4\u5ba1\u6d41\u7a0b\u4e2d&#xff0c;\u4fdd\u6301\u7ebf\u6027\u5386\u53f2\u3001\u907f\u514d\u81ea\u52a8 merge commit \u662f\u66f4\u7a33\u59a5\u7684\u505a\u6cd5\u3002<\/p>\n<h4>3.2 \u53ef\u80fd\u5e72\u6270 Change-Id \u8ffd\u8e2a<\/h4>\n<p>Gerrit \u901a\u8fc7\u63d0\u4ea4\u4fe1\u606f\u5e95\u90e8\u7684&#xff1a;<\/p>\n<p>Change-Id: Ixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx<\/p>\n<p>\u6765\u8ffd\u8e2a\u540c\u4e00\u4e2a\u8bc4\u5ba1\u7684\u591a\u4e2a patch set\u3002rebase \u6216 amend \u540e&#xff0c;\u63d0\u4ea4 SHA \u53ef\u4ee5\u53d8\u5316&#xff0c;\u4f46 Change-Id \u5fc5\u987b\u4fdd\u7559\u3002\u5982\u679c merge commit \u5939\u5728\u5386\u53f2\u4e2d&#xff0c;\u540e\u7eed\u64cd\u4f5c\u4e0d\u5f53\u53ef\u80fd\u5bfc\u81f4&#xff1a;<\/p>\n<ul>\n<li>merge commit \u7f3a\u5c11 Change-Id&#xff1b;<\/li>\n<li>\u591a\u4e2a\u63d0\u4ea4\u643a\u5e26\u76f8\u540c Change-Id&#xff1b;<\/li>\n<li>Gerrit \u627e\u4e0d\u5230\u539f\u6709 Change&#xff0c;\u6216\u62d2\u7edd\u63a8\u9001\u3002<\/li>\n<\/ul>\n<p>\u56e0\u6b64&#xff0c;\u5728 Gerrit \u5206\u652f\u4e0a\u6267\u884c pull \u540e&#xff0c;\u63a8\u9001\u524d\u5e94\u786e\u8ba4\u5386\u53f2\u4e2d\u6ca1\u6709\u591a\u4f59 merge commit&#xff0c;\u5e76\u4e14 Change-Id \u4ecd\u4f4d\u4e8e\u63d0\u4ea4\u4fe1\u606f\u5e95\u90e8\u3002<\/p>\n<hr \/>\n<h3>4. \u5e38\u7528\u64cd\u4f5c\u4e0e\u4fee\u590d\u65b9\u5f0f<\/h3>\n<h4>4.1 \u5148\u67e5\u770b\u662f\u5426\u5206\u53c9<\/h4>\n<p>\u63a8\u8350\u5148 fetch&#xff0c;\u518d\u89c2\u5bdf&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> fetch origin<br \/>\n<span class=\"token function\">git<\/span> log <span class=\"token parameter variable\">&#8211;graph<\/span> <span class=\"token parameter variable\">&#8211;oneline<\/span> <span class=\"token parameter variable\">&#8211;decorate<\/span> HEAD<span class=\"token punctuation\">..<\/span>origin\/xxx1<\/p>\n<p>\u5982\u679c\u672c\u5730\u6709\u72ec\u6709\u63d0\u4ea4&#xff0c;\u53ef\u4ee5\u67e5\u770b&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> log <span class=\"token parameter variable\">&#8211;graph<\/span> <span class=\"token parameter variable\">&#8211;oneline<\/span> <span class=\"token parameter variable\">&#8211;decorate<\/span> origin\/xxx1<span class=\"token punctuation\">..<\/span>HEAD<\/p>\n<p>\u786e\u8ba4\u5206\u53c9\u60c5\u51b5\u540e&#xff0c;\u518d\u51b3\u5b9a\u4f7f\u7528 merge \u8fd8\u662f rebase\u3002<\/p>\n<h4>4.2 \u63a8\u8350&#xff1a;\u4f7f\u7528 rebase \u62c9\u53d6<\/h4>\n<p><span class=\"token function\">git<\/span> pull <span class=\"token parameter variable\">&#8211;rebase<\/span> origin xxx1<\/p>\n<p>\u8fd9\u4f1a\u628a\u8fdc\u7aef\u66f4\u65b0\u4f5c\u4e3a\u57fa\u5e95&#xff0c;\u628a\u672c\u5730\u5c1a\u672a\u63a8\u9001\u7684\u63d0\u4ea4\u91cd\u653e\u5230\u5176\u540e&#xff0c;\u907f\u514d\u4ea7\u751f merge commit\u3002<\/p>\n<p>\u5982\u679c\u5e0c\u671b\u957f\u671f\u9ed8\u8ba4\u4f7f\u7528 rebase&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> config <span class=\"token parameter variable\">&#8211;global<\/span> pull.rebase <span class=\"token boolean\">true<\/span><\/p>\n<p>\u4e4b\u540e\u76f4\u63a5\u6267\u884c git pull \u5c31\u4f1a\u8d70 rebase \u8def\u5f84\u3002\u4e5f\u53ef\u4ee5\u53ea\u5bf9\u5f53\u524d\u4ed3\u5e93\u914d\u7f6e&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> config pull.rebase <span class=\"token boolean\">true<\/span><\/p>\n<h4>4.3 \u5e0c\u671b\u663e\u5f0f\u611f\u77e5\u5206\u53c9&#xff1a;&#8211;ff-only<\/h4>\n<p><span class=\"token function\">git<\/span> pull &#8211;ff-only origin xxx1<\/p>\n<p>\u8be5\u547d\u4ee4\u53ea\u5728\u53ef\u4ee5\u5feb\u8fdb\u65f6\u66f4\u65b0&#xff1b;\u5982\u679c\u5df2\u7ecf\u5206\u53c9&#xff0c;\u4f1a\u76f4\u63a5\u62a5\u9519&#xff0c;\u4e0d\u4f1a\u81ea\u52a8\u4ea7\u751f merge commit\u3002\u9002\u5408\u5e0c\u671b\u624b\u52a8\u5904\u7406\u5206\u53c9\u7684\u573a\u666f\u3002<\/p>\n<h4>4.4 \u5df2\u7ecf\u4ea7\u751f\u4e86 Merge commit&#xff0c;\u4f46\u8fd8\u6ca1\u63a8\u9001<\/h4>\n<p>\u5982\u679c\u521a\u521a\u6267\u884c\u5b8c git pull \u4ea7\u751f\u4e86 merge commit&#xff0c;\u4e14\u5de5\u4f5c\u533a\u5e72\u51c0\u3001\u5c1a\u672a\u63a8\u9001&#xff0c;\u53ef\u4ee5\u64a4\u9500\u8fd9\u6b21\u5408\u5e76\u540e\u6539\u7528 rebase&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> reset <span class=\"token parameter variable\">&#8211;hard<\/span> ORIG_HEAD<br \/>\n<span class=\"token function\">git<\/span> pull <span class=\"token parameter variable\">&#8211;rebase<\/span> origin xxx1<\/p>\n<p>ORIG_HEAD \u901a\u5e38\u6307\u5411 merge \u524d\u7684 HEAD\u3002reset &#8211;hard \u4f1a\u4e22\u5f03\u5de5\u4f5c\u533a\u672a\u63d0\u4ea4\u4fee\u6539&#xff0c;\u6267\u884c\u524d\u52a1\u5fc5\u786e\u8ba4&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> status<\/p>\n<p>\u5982\u679c\u4e0d\u60f3\u4f7f\u7528 reset &#8211;hard&#xff0c;\u4e5f\u53ef\u4ee5\u5148\u67e5\u770b\u5386\u53f2&#xff0c;\u518d\u57fa\u4e8e origin\/xxx1 \u6267\u884c rebase\u3002\u6838\u5fc3\u76ee\u6807\u662f&#xff1a;\u4e22\u5f03\u81ea\u52a8\u751f\u6210\u7684 merge commit&#xff0c;\u628a\u81ea\u5df1\u7684\u672c\u5730\u63d0\u4ea4\u91cd\u653e\u5230\u8fdc\u7aef\u6700\u65b0\u63d0\u4ea4\u4e4b\u540e\u3002<\/p>\n<h4>4.5 rebase \u51b2\u7a81\u5904\u7406<\/h4>\n<p>\u5982\u679c git pull &#8211;rebase \u8fc7\u7a0b\u4e2d\u51fa\u73b0\u51b2\u7a81&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> status<br \/>\n<span class=\"token comment\"># \u7f16\u8f91\u51b2\u7a81\u6587\u4ef6<\/span><br \/>\n<span class=\"token function\">git<\/span> <span class=\"token function\">add<\/span> <span class=\"token operator\">&lt;<\/span>\u51b2\u7a81\u6587\u4ef6<span class=\"token operator\">&gt;<\/span><br \/>\n<span class=\"token function\">git<\/span> rebase <span class=\"token parameter variable\">&#8211;continue<\/span><\/p>\n<p>\u60f3\u653e\u5f03\u672c\u6b21 rebase&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> rebase <span class=\"token parameter variable\">&#8211;abort<\/span><\/p>\n<h4>4.6 \u63a8\u9001\u8bc4\u5ba1\u524d\u68c0\u67e5<\/h4>\n<p>\u63a8\u9001 Gerrit \u8bc4\u5ba1\u901a\u5e38\u4f7f\u7528&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> push origin HEAD:refs\/for\/xxx1<\/p>\n<p>\u63a8\u9001\u524d\u5efa\u8bae\u68c0\u67e5&#xff1a;<\/p>\n<p><span class=\"token comment\"># \u5386\u53f2\u4e2d\u662f\u5426\u8fd8\u6709 merge commit<\/span><br \/>\n<span class=\"token function\">git<\/span> log <span class=\"token parameter variable\">&#8211;oneline<\/span> <span class=\"token parameter variable\">&#8211;merges<\/span> origin\/xxx1<span class=\"token punctuation\">..<\/span>HEAD<\/p>\n<p><span class=\"token comment\"># \u67e5\u770b\u6700\u65b0\u63d0\u4ea4\u4fe1\u606f&#xff0c;\u786e\u8ba4 Change-Id \u4ecd\u5728\u5e95\u90e8<\/span><br \/>\n<span class=\"token function\">git<\/span> log <span class=\"token parameter variable\">-1<\/span><\/p>\n<p><span class=\"token comment\"># \u786e\u8ba4\u5de5\u4f5c\u533a\u5e72\u51c0<\/span><br \/>\n<span class=\"token function\">git<\/span> status<\/p>\n<p>\u5982\u679c &#8211;merges \u6ca1\u6709\u8f93\u51fa&#xff0c;\u8bf4\u660e\u4f60\u7684\u5206\u652f\u76f8\u5bf9\u8fdc\u7aef\u662f\u7ebf\u6027\u7684&#xff0c;\u66f4\u9002\u5408 Gerrit \u8bc4\u5ba1\u3002<\/p>\n<hr \/>\n<h3>5. \u6ce8\u610f\u4e8b\u9879\u6e05\u5355<\/h3>\n<li>\n<p>\u4e0d\u8981\u628a Merge branch &#8230; \u5f53\u6210\u666e\u901a\u7a7a\u63d0\u4ea4\u76f4\u63a5\u63a8\u9001\u3002<br \/>\n\u5b83\u662f merge commit&#xff0c;Gerrit \u9ed8\u8ba4\u901a\u5e38\u4e0d\u63a5\u53d7&#xff0c;\u4e14\u53ef\u80fd\u7834\u574f\u8bc4\u5ba1\u5386\u53f2\u3002<\/p>\n<\/li>\n<li>\n<p>Gerrit \u4e2a\u4eba\u5f00\u53d1\u5206\u652f\u4f18\u5148\u4f7f\u7528 git pull &#8211;rebase\u3002<br \/>\n\u53ef\u4ee5\u914d\u7f6e pull.rebase&#061;true \u4f5c\u4e3a\u9ed8\u8ba4\u884c\u4e3a\u3002<\/p>\n<\/li>\n<li>\n<p>rebase \u4f1a\u6539\u5199\u672c\u5730\u63d0\u4ea4 SHA&#xff0c;\u4f46 Change-Id \u5fc5\u987b\u4fdd\u7559\u3002<br \/>\n\u63a8\u9001\u540e Gerrit \u4f1a\u5c06\u5176\u8bc6\u522b\u4e3a\u540c\u4e00 Change \u7684\u65b0 patch set\u3002<\/p>\n<\/li>\n<li>\n<p>\u4e0d\u8981\u968f\u610f rebase \u591a\u4eba\u5171\u4eab\u7684\u516c\u5171\u5386\u53f2\u3002<br \/>\nrebase \u9002\u5408\u81ea\u5df1\u5c1a\u672a\u5408\u5165\u7684\u672c\u5730\u63d0\u4ea4&#xff1b;\u5982\u679c\u5206\u652f\u591a\u4eba\u5171\u4eab\u4e14\u63d0\u4ea4\u5df2\u88ab\u4ed6\u4eba\u4f9d\u8d56&#xff0c;\u5e94\u5148\u4e0e\u56e2\u961f\u7ea6\u5b9a\u3002<\/p>\n<\/li>\n<li>\n<p>\u6267\u884c reset &#8211;hard \u524d\u5fc5\u987b\u786e\u8ba4\u5de5\u4f5c\u533a\u5e72\u51c0\u3002<br \/>\n\u5b83\u4f1a\u4e22\u5f03\u672a\u63d0\u4ea4\u4fee\u6539\u3002\u66f4\u5b89\u5168\u7684\u505a\u6cd5\u662f\u5148 git status\u3001git stash \u6216\u63d0\u4ea4\u3002<\/p>\n<\/li>\n<li>\n<p>\u63a8\u9001\u8bc4\u5ba1\u4f7f\u7528 refs\/for\/&lt;branch&gt;&#xff0c;\u4e0d\u8981\u8bef\u63a8 refs\/heads\/&lt;branch&gt;\u3002<br \/>\n\u540e\u8005\u662f\u76f4\u63a5\u66f4\u65b0\u5206\u652f&#xff0c;\u901a\u5e38\u9700\u8981\u989d\u5916\u6743\u9650&#xff0c;\u4e5f\u4f1a\u7ed5\u8fc7\u8bc4\u5ba1\u6d41\u7a0b\u3002<\/p>\n<\/li>\n<li>\n<p>\u5982\u679c\u9879\u76ee\u786e\u5b9e\u5141\u8bb8 merge commit&#xff0c;\u4e5f\u8981\u786e\u8ba4 pushMerge \u6743\u9650\u548c\u56e2\u961f\u89c4\u8303\u3002<br \/>\n\u9ed8\u8ba4\u62d2\u7edd\u4e0d\u4ee3\u8868\u6240\u6709\u9879\u76ee\u90fd\u62d2\u7edd&#xff0c;\u4f46 Gerrit \u8bc4\u5ba1\u6d41\u901a\u5e38\u66f4\u504f\u597d\u7ebf\u6027\u5386\u53f2\u3002<\/p>\n<\/li>\n<hr \/>\n<h3>6. \u603b\u7ed3<\/h3>\n<p>git pull origin xxx1 \u540e\u51fa\u73b0 Merge branch &#8230; \u63d0\u4ea4&#xff0c;\u5e76\u4e0d\u662f Git \u6545\u969c&#xff0c;\u800c\u662f\u9ed8\u8ba4 merge \u7b56\u7565\u5728\u672c\u5730\u4e0e\u8fdc\u7aef\u5386\u53f2\u5206\u53c9\u65f6\u7684\u6b63\u5e38\u4ea7\u7269\u3002\u5b83\u901a\u5e38\u4e0d\u643a\u5e26\u6587\u4ef6\u53d8\u66f4&#xff0c;\u4f46\u672c\u8d28\u4e0a\u662f\u4e00\u4e2a merge commit\u3002<\/p>\n<p>\u5728 Gerrit \u5de5\u4f5c\u6d41\u4e2d&#xff0c;\u8fd9\u7c7b\u63d0\u4ea4\u9ed8\u8ba4\u53ef\u80fd\u88ab refs\/for\/xxx1 \u62d2\u6536&#xff0c;\u4e5f\u53ef\u80fd\u7ed9 Change-Id \u8ffd\u8e2a\u5e26\u6765\u9ebb\u70e6\u3002\u66f4\u63a8\u8350\u7684\u505a\u6cd5\u662f&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> pull <span class=\"token parameter variable\">&#8211;rebase<\/span> origin xxx1<\/p>\n<p>\u6216\u957f\u671f\u914d\u7f6e&#xff1a;<\/p>\n<p><span class=\"token function\">git<\/span> config <span class=\"token parameter variable\">&#8211;global<\/span> pull.rebase <span class=\"token boolean\">true<\/span><\/p>\n<p>\u5982\u679c\u5df2\u7ecf\u4ea7\u751f merge commit \u4e14\u5c1a\u672a\u63a8\u9001&#xff0c;\u53ef\u4ee5\u64a4\u9500\u540e\u6539\u7528 rebase&#xff1b;\u63a8\u9001\u524d\u68c0\u67e5\u5386\u53f2\u662f\u5426\u7ebf\u6027\u3001Change-Id \u662f\u5426\u4fdd\u7559\u3002\u628a pull \u7684\u6574\u5408\u65b9\u5f0f\u4ece\u9ed8\u8ba4 merge \u8c03\u6574\u4e3a rebase&#xff0c;\u662f Gerrit \u5de5\u7a0b\u4e2d\u4fdd\u6301\u63d0\u4ea4\u5386\u53f2\u5e72\u51c0\u3001\u8bc4\u5ba1\u6d41\u7a0b\u987a\u7545\u7684\u5173\u952e\u4e60\u60ef\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\/* MD \/ \u5bcc\u6587\u672c\u4e2d\u7684 .toc\uff08\u542b\u535a\u5ba2\u56ed\u642c\u5bb6\u7b49\u5d4c\u5957\u7ed3\u6784\uff09\uff1b.toc-box \u5728\u4fa7\u680f\uff0c\u4e0d\u53d7\u5f71\u54cd *\/#content_views .toc,\/* \u7f16\u8f91\u5668\u5e38\u5728\u76ee\u5f55\u524d\u540e\u63d2\u5165\u7a7a p\uff08:empty \u4ecd\u5360 20px\uff09\uff0c\u4e00\u5e76\u53bb\u6389\u907f\u514d\u9876\u7a7a\u9699 *\/#content_views.markdown_views &gt; p:empty:has(+ .toc),#content_views.markdown_views &gt; .toc + p:empty,\/* \u5bcc\u6587\u672c\u65e7\u7248\u76ee\u5f55\u6807\u8bb0 *\/#content<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[13951,13950,89],"topic":[],"class_list":["post-121897","post","type-post","status-publish","format-standard","hentry","category-server","tag-merge","tag-pull","tag-git"],"yoast_head":"<!-- This site is optimized with the Yoast SEO plugin v20.3 - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>git pull \u4ea7\u751f \u201cMerge branch\u201d \u63d0\u4ea4\uff1fGerrit \u5de5\u4f5c\u6d41\u4e0b\u7684\u539f\u7406\u3001\u4fee\u590d\u4e0e\u6700\u4f73\u5b9e\u8df5 - \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\/121897.html\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"git pull \u4ea7\u751f \u201cMerge branch\u201d \u63d0\u4ea4\uff1fGerrit \u5de5\u4f5c\u6d41\u4e0b\u7684\u539f\u7406\u3001\u4fee\u590d\u4e0e\u6700\u4f73\u5b9e\u8df5 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\" \/>\n<meta property=\"og:description\" content=\"\/* MD \/ \u5bcc\u6587\u672c\u4e2d\u7684 .toc\uff08\u542b\u535a\u5ba2\u56ed\u642c\u5bb6\u7b49\u5d4c\u5957\u7ed3\u6784\uff09\uff1b.toc-box \u5728\u4fa7\u680f\uff0c\u4e0d\u53d7\u5f71\u54cd *\/#content_views .toc,\/* \u7f16\u8f91\u5668\u5e38\u5728\u76ee\u5f55\u524d\u540e\u63d2\u5165\u7a7a p\uff08:empty \u4ecd\u5360 20px\uff09\uff0c\u4e00\u5e76\u53bb\u6389\u907f\u514d\u9876\u7a7a\u9699 *\/#content_views.markdown_views &gt; p:empty:has(+ .toc),#content_views.markdown_views &gt; .toc + p:empty,\/* \u5bcc\u6587\u672c\u65e7\u7248\u76ee\u5f55\u6807\u8bb0 *\/#content\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.wsisp.com\/helps\/121897.html\" \/>\n<meta property=\"og:site_name\" content=\"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\" \/>\n<meta property=\"article:published_time\" content=\"2026-11-03T15:48:48+00:00\" \/>\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=\"4 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/121897.html\",\"url\":\"https:\/\/www.wsisp.com\/helps\/121897.html\",\"name\":\"git pull \u4ea7\u751f \u201cMerge branch\u201d \u63d0\u4ea4\uff1fGerrit \u5de5\u4f5c\u6d41\u4e0b\u7684\u539f\u7406\u3001\u4fee\u590d\u4e0e\u6700\u4f73\u5b9e\u8df5 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\",\"isPartOf\":{\"@id\":\"https:\/\/www.wsisp.com\/helps\/#website\"},\"datePublished\":\"2026-11-03T15:48:48+00:00\",\"dateModified\":\"2026-11-03T15:48:48+00:00\",\"author\":{\"@id\":\"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.wsisp.com\/helps\/121897.html#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.wsisp.com\/helps\/121897.html\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/121897.html#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.wsisp.com\/helps\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"git pull \u4ea7\u751f \u201cMerge branch\u201d \u63d0\u4ea4\uff1fGerrit \u5de5\u4f5c\u6d41\u4e0b\u7684\u539f\u7406\u3001\u4fee\u590d\u4e0e\u6700\u4f73\u5b9e\u8df5\"}]},{\"@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":"git pull \u4ea7\u751f \u201cMerge branch\u201d \u63d0\u4ea4\uff1fGerrit \u5de5\u4f5c\u6d41\u4e0b\u7684\u539f\u7406\u3001\u4fee\u590d\u4e0e\u6700\u4f73\u5b9e\u8df5 - \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\/121897.html","og_locale":"zh_CN","og_type":"article","og_title":"git pull \u4ea7\u751f \u201cMerge branch\u201d \u63d0\u4ea4\uff1fGerrit \u5de5\u4f5c\u6d41\u4e0b\u7684\u539f\u7406\u3001\u4fee\u590d\u4e0e\u6700\u4f73\u5b9e\u8df5 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","og_description":"\/* MD \/ \u5bcc\u6587\u672c\u4e2d\u7684 .toc\uff08\u542b\u535a\u5ba2\u56ed\u642c\u5bb6\u7b49\u5d4c\u5957\u7ed3\u6784\uff09\uff1b.toc-box \u5728\u4fa7\u680f\uff0c\u4e0d\u53d7\u5f71\u54cd *\/#content_views .toc,\/* \u7f16\u8f91\u5668\u5e38\u5728\u76ee\u5f55\u524d\u540e\u63d2\u5165\u7a7a p\uff08:empty \u4ecd\u5360 20px\uff09\uff0c\u4e00\u5e76\u53bb\u6389\u907f\u514d\u9876\u7a7a\u9699 *\/#content_views.markdown_views &gt; p:empty:has(+ .toc),#content_views.markdown_views &gt; .toc + p:empty,\/* \u5bcc\u6587\u672c\u65e7\u7248\u76ee\u5f55\u6807\u8bb0 *\/#content","og_url":"https:\/\/www.wsisp.com\/helps\/121897.html","og_site_name":"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","article_published_time":"2026-11-03T15:48:48+00:00","author":"admin","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"admin","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"4 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.wsisp.com\/helps\/121897.html","url":"https:\/\/www.wsisp.com\/helps\/121897.html","name":"git pull \u4ea7\u751f \u201cMerge branch\u201d \u63d0\u4ea4\uff1fGerrit \u5de5\u4f5c\u6d41\u4e0b\u7684\u539f\u7406\u3001\u4fee\u590d\u4e0e\u6700\u4f73\u5b9e\u8df5 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","isPartOf":{"@id":"https:\/\/www.wsisp.com\/helps\/#website"},"datePublished":"2026-11-03T15:48:48+00:00","dateModified":"2026-11-03T15:48:48+00:00","author":{"@id":"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41"},"breadcrumb":{"@id":"https:\/\/www.wsisp.com\/helps\/121897.html#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.wsisp.com\/helps\/121897.html"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.wsisp.com\/helps\/121897.html#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.wsisp.com\/helps"},{"@type":"ListItem","position":2,"name":"git pull \u4ea7\u751f \u201cMerge branch\u201d \u63d0\u4ea4\uff1fGerrit \u5de5\u4f5c\u6d41\u4e0b\u7684\u539f\u7406\u3001\u4fee\u590d\u4e0e\u6700\u4f73\u5b9e\u8df5"}]},{"@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\/121897","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=121897"}],"version-history":[{"count":0,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/posts\/121897\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/media?parent=121897"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/categories?post=121897"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/tags?post=121897"},{"taxonomy":"topic","embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/topic?post=121897"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}