{"id":37846,"date":"2023-02-09T12:24:24","date_gmt":"2024-01-17T05:36:32","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/"},"modified":"2024-04-29T13:50:05","modified_gmt":"2024-04-29T05:50:05","slug":"%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/","title":{"rendered":"\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git pull\u548cgit pull &#8211;rebase\u6709\u4ec0\u4e48\u533a\u522b\uff1f"},"content":{"rendered":"<h1>\u9996\u5148<\/h1>\n<p>\u5728\u73b0\u573a\u6709\u4eba\u5728Git\u64cd\u4f5c\u4e2d\uff0c\u867d\u7136\u4e86\u89e3pull\uff0c\u4f46\u5bf9rebase\u662f\u4ec0\u4e48\u5e76\u4e0d\u6e05\u695a\u3002<\/p>\n<p>\u5728\u672c\u6587\u4e2d\uff0c\u6211\u5c06\u89e3\u91cagit pull\u548cgit pull -rebase\u4e4b\u95f4\u7684\u533a\u522b\u3002<\/p>\n<h1>\u5728\u54ea\u79cd\u60c5\u51b5\u4e0b\u4f7f\u7528\u4e86git pull -rebase\u547d\u4ee4\uff1f<\/h1>\n<p>\u5f53\u6211\u88ab\u5206\u914d\u5230\u73b0\u573a\u5f00\u5c55\u5de5\u4f5c\u65f6\uff0c\u6211\u521b\u5efa\u4e86\u4e00\u4e2a\u57fa\u4e8edevelop\u5206\u652f\u7684feature\u5206\u652f\uff0c\u5e76\u4f7f\u7528\u4e86git pull -rebase\u547d\u4ee4\u3002<\/p>\n<p>\u6211\u4ece\u524d\u8f88\u90a3\u91cc\u83b7\u5f97\u4e86\u8fd9\u6837\u7684\u5efa\u8bae\u3002<\/p>\n<p>\u5728\u8fdb\u884c\u201cpull\u201d\u64cd\u4f5c\u65f6\u8fdb\u884c\u5f00\u53d1<\/p>\n<pre class=\"post-pre\"><code>$ git fetch\r\n$ git pull -rebase origin develop\r\n<\/code><\/pre>\n<p>\u6211\u5f97\u5230\u4e86\u4f7f\u7528\u548c\u5efa\u8bae\u3002<\/p>\n<p>\u542c\u8bf4\u8fd9\u662f\u4e3a\u4e86\u907f\u514d\u65e0\u8c13\u7684\u63d0\u4ea4\u3002<\/p>\n<h1>\u64b0\u5199\u8fd9\u7bc7\u6587\u7ae0\u7684\u52a8\u673a<\/h1>\n<p>\u7531\u4e8e\u6211\u4e0d\u7406\u89e3\u4e3a\u4ec0\u4e48\u8981\u4f7f\u7528\u8fd9\u4e2a&#8211;rebase\uff0c\u6240\u4ee5\u6211\u8bf7\u524d\u8f88\u7ed9\u6211\u4ecb\u7ecd\u4e86\u4e00\u7bc7\u6587\u7ae0\uff0c\u5e76\u5728\u4e0b\u9762\u7684\u53c2\u8003\u8d44\u6599\u4e2d\u8fdb\u884c\u4e86\u8c03\u67e5\u3002<\/p>\n<p>\u6211\u89c9\u5f97\u6709\u5fc5\u8981\u4e86\u89e3git fetch\u3001pull\u3001merge\u548crebase\u5404\u81ea\u7684\u533a\u522b\u3002<\/p>\n<h1>\u524d\u63d0\u77e5\u8b58<\/h1>\n<p>\u8981\u7406\u89e3git pull &#8211;rebase\uff0c\u5fc5\u987b\u8981\u6e05\u695a\u7406\u89e3fetch\u3001merge\u548crebase\u8fd9\u4e09\u4e2aGit\u547d\u4ee4\u3002<\/p>\n<h3>\u83b7\u53d6git<\/h3>\n<p>\u8fd9\u662f\u4e00\u4e2a\u5c06\u8fdc\u7a0b\u73af\u5883\u7684\u6700\u65b0\u4fe1\u606f\u540c\u6b65\u5230\u672c\u5730\u73af\u5883\u7684\u547d\u4ee4\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git fetch \r\n\r\n$ git fetch origin master\u3000\u3000\/\/\u30ea\u30e2\u30fc\u30c8\u306emaster\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u30ed\u30fc\u30ab\u30eb\u306eorigin\/master\u30d6\u30e9\u30f3\u30c1\u3078\u53cd\u6620\r\n<\/code><\/pre>\n<h3>\u5408\u5e76git<\/h3>\n<p>\u5c06\u5f53\u524d\u5206\u652f\u7684\u5185\u5bb9\u540c\u6b65\u5230\u5176\u4ed6\u5206\u652f\u6216\u4e3b\u5206\u652f\uff08\u5982master\uff09\u7684\u547d\u4ee4\u3002<br \/>\n\u4eceorigin\/master\u540c\u6b65\u6700\u65b0\u4fe1\u606f\u5230master\u5206\u652f\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git merge master \/\/master\u30d6\u30e9\u30f3\u30c1\u306e\u5185\u5bb9\u3092\u4eca\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3057\u305f\u3044\u6642\r\n<\/code><\/pre>\n<h1>git rebase\u53ef\u4ee5\u7528\u4ee5\u4e0b\u65b9\u5f0f\u8fdb\u884c\u91ca\u4e49:<\/h1>\n<p>\u5408\u5e76\u662f\u4e00\u4e2a\u547d\u4ee4\uff0c\u7c7b\u4f3c\u4e8e\u201cmerge\u201d\uff0c\u5b83\u53ef\u4ee5\u5c06\u53e6\u4e00\u4e2a\u5206\u652f\u7684\u4fe1\u606f\u5e94\u7528\u5230\u5f53\u524d\u6240\u5728\u7684\u5206\u652f\u4e0a\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d305d37434c4406c5ba18\/23-0.png\" alt=\"image.png\" \/><\/div>\n<blockquote><p>\u53c2\u8003\u6765\u6e90\uff1ahttps:\/\/kray.jp\/blog\/git-pull-rebase\/<\/p>\n<p>Please note that this source is in Japanese and does not provide a Chinese version. Please let me know if you have any other requests.<\/p><\/blockquote>\n<p>\u7136\u540e\uff0c\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git rebase master  \/\/\u4eca\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u3092 master \u306b\u30ea\u30d9\u30fc\u30b9\u3057\u305f\u3044\u6642\r\n<\/code><\/pre>\n<p>\u5c06\u4f4d\u4e8e\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u7684\u4e24\u4e2a\u63d0\u4ea4\u6682\u65f6\u4fdd\u5b58\uff0c\u5c06\u53e6\u4e00\u4e2a\u5206\u652f\u91cd\u65b0\u5b9a\u4f4d\u5230\u91cd\u65b0\u57fa\u4e8e\u7684\u5206\u652f\u4e0a\u3002<br \/>\n\u4f7f\u7528git reset &#8211;hard\uff08\u5c06\u5206\u652f\u4e0emaster\u5206\u652f\u7684\u72b6\u6001\u8bbe\u7f6e\u4e3a\u76f8\u540c\uff09\u547d\u4ee4\u6267\u884c\u6b64\u64cd\u4f5c\u3002<\/p>\n<p>\u5c06\u91cd\u7f6e\u540e\u7684\u63d0\u4ea4\u653e\u5165\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u4e0a\u7684\u4e34\u65f6\u5b58\u50a8\u4f4d\u7f6e\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d305d37434c4406c5ba18\/29-0.png\" alt=\"image.png\" \/><\/div>\n<blockquote><p>\u53c2\u8003\u8d44\u6599\u7f51\u5740\uff1ahttps:\/\/kray.jp\/blog\/git-pull-rebase\/<\/p><\/blockquote>\n<p>\u7531\u4e8e\u8fdb\u884cgit rebase\u64cd\u4f5c\uff0c\u56e0\u6b64\u4f1a\u91cd\u65b0\u521b\u5efa\u63d0\u4ea4\u8bb0\u5f55\u3002<br \/>\n\u5728\u91cd\u65b0\u521b\u5efa\u4e4b\u524d\uff0c\u63d0\u4ea4\u8bb0\u5f55\u548c\u7236\u63d0\u4ea4\u7684id\u4f1a\u53d1\u751f\u66f4\u6539\uff0c\u8fd9\u6837\u4f1a\u5c06master\u5206\u652f\u7684\u4fee\u6539\u5408\u5e76\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d305d37434c4406c5ba18\/32-0.png\" alt=\"image.png\" \/><\/div>\n<blockquote><p>\u8bf7\u53c2\u8003https:\/\/kray.jp\/blog\/git-pull-rebase\/<\/p><\/blockquote>\n<h3>git merge\u548crebase\u7684\u533a\u522b<\/h3>\n<p>git merge\u6307\u4ee4\u4f1a\u5c06\u5f53\u524d\u5206\u652f\u5408\u5e76\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u3002<br \/>\ngit rebase\u6307\u4ee4\u4f1a\u5c06\u5f53\u524d\u5206\u652f\u7684\u5185\u5bb9\u5e94\u7528\u5230\u60f3\u8981\u5408\u5e76\u7684\u5206\u652f\u4e4b\u4e0a\u3002<\/p>\n<h1>\u62c9\u53d6\u4ee3\u7801<\/h1>\n<p>\u8fd9\u662f\u4e00\u4e2a\u540c\u65f6\u8fdb\u884cgit merge\u548cgit fetch\u7684\u547d\u4ee4\u3002<br \/>\n\u5b83\u53ef\u4ee5\u5c06\u8fdc\u7a0b\u7684master\u5206\u652f\u6700\u65b0\u4fe1\u606f\u4e00\u6b21\u6027\u540c\u6b65\u5230\u672c\u5730\u7684master\u5206\u652f\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git fetch\r\n$ git merge origin master\r\n<\/code><\/pre>\n<p>\u60a8\u53ef\u4ee5\u6279\u91cf\u5e94\u7528\u6b64\u64cd\u4f5c\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git pull origin master\r\n<\/code><\/pre>\n<h4>\u8bf7\u6ce8\u610f<\/h4>\n<p>\u6211\u4ece\u524d\u8f88\u5de5\u7a0b\u5e08\u90a3\u91cc\u542c\u8bf4\uff0c\u597d\u50cf\u5728\u73b0\u573a\u5373\u4f7f\u4e0d\u4f7f\u7528\u4e5f\u4f1a\u88ab\u770b\u5230\u3002<br \/>\n\u539f\u56e0\u662f\u5982\u679c\u5176\u4ed6\u5730\u65b9\u53d1\u751f\u9519\u8bef\uff0c\u4f3c\u4e4e\u4f1a\u5c06\u5176\u4ed6\u4eba\u7684\u9519\u8bef\u4e5f\u4e00\u5e76\u5e26\u5165\u3002<br \/>\n(\u5728\u6211\u76ee\u524d\u53c2\u4e0e\u7684\u73b0\u573a\u4e2d\uff0c\u6211\u4eec\u901a\u5e38\u4f7f\u7528\u62c9\u53d6\u64cd\u4f5c\u3002)<br \/>\n\u57fa\u672c\u4e0a\uff0c\u53cd\u6620\u9519\u8bef\u72b6\u6001\u66f4\u4e3a\u7f55\u89c1\u3002<\/p>\n<h1>\u62c9\u53d6\u4ee3\u7801\u5e76\u8fdb\u884c\u53d8\u57fa\u64cd\u4f5c<\/h1>\n<p>&#8211;rebase\u5728Git pull\u547d\u4ee4\u4e2d\u662f\u4e00\u79cd\u9009\u9879\u53c2\u6570\u3002<br \/>\n\u901a\u8fc7\u5728git pull\u547d\u4ee4\u4e2d\u6dfb\u52a0&#8211;rebase\u9009\u9879\uff0c\u76f8\u5f53\u4e8e\u6267\u884cgit fetch + rebase\u64cd\u4f5c\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git pull --rebase origin master\r\n<\/code><\/pre>\n<p>\u5982\u679c\u5f80\u4e0a\u8d70<\/p>\n<pre class=\"post-pre\"><code>$ git pull --rebase origin develop\r\n<\/code><\/pre>\n<p>\u662f\u7684\u3002<\/p>\n<h1>git pull\u548cgit pull &#8211;rebase\u7684\u4e0d\u540c\u4e4b\u5904<\/h1>\n<p>\u4ece\u4e0a\u7ea7\u5148\u8f88\u90a3\u91cc\u542c\u8bf4\uff0c\u5f53\u5728develop\u5206\u652f\u4e0a\u8fdb\u884c\u5206\u652f\u5207\u6362\u65f6\uff0c\u6700\u597d\u4f7f\u7528&#8211;rebase\u9009\u9879\u6765\u62c9\u53d6\u66f4\u65b0\uff0c\u8fd9\u6837\u53ef\u4ee5\u907f\u514d\u521b\u5efa\u5408\u5e76\u63d0\u4ea4\uff0c\u540c\u65f6\u4e0d\u4f1a\u7559\u4e0b\u591a\u4f59\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u4f7f\u4ee3\u7801\u66f4\u52a0\u6574\u6d01\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git pull --rebase origin develop\r\n<\/code><\/pre>\n<p>\u6839\u636e\u53c2\u8003\u8d44\u6599\u6765\u770b<\/p>\n<pre class=\"post-pre\"><code>$ git pull --rebase origin master\r\n<\/code><\/pre>\n<p>\u6211\u60f3\u8981\u4f60\u4eec\u5728\u5b8c\u6210\u540e\u7acb\u5373\u63d0\u4ea4\u62c9\u53d6\u8bf7\u6c42\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d305d37434c4406c5ba18\/55-0.png\" alt=\"image.png\" \/><\/div>\n<blockquote><p>\u5f15\u7528\u81eahttps:\/\/kray.jp\/blog\/git-pull-rebase\/<\/p><\/blockquote>\n<h3>\u8bf7\u7559\u610f<\/h3>\n<p>&#8211;\u636e\u8bf4\u5173\u4e8erebase\u7684\u65b9\u6cd5\u6709\u5f88\u591a\u4e89\u8bae\uff08\u5c3d\u7ba1\u8fd9\u6837\u53ef\u4ee5\u4f7f\u65e5\u5fd7\u53d8\u5f97\u66f4\u6574\u6d01\uff0c\u4f46\u4e0d\u5e94\u8be5\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\uff09\u3002<br \/>\n\u7a81\u7136\u8fdb\u884crebase\u53ef\u80fd\u8fdd\u53cd\u56e2\u961f\u7684\u89c4\u5b9a\uff0c\u56e0\u6b64\u53ef\u80fd\u4f1a\u56e0\u56e2\u961f\u6216\u9879\u76ee\u800c\u5f02\uff0c\u6240\u4ee5\u6700\u597d\u5411\u6210\u5458\u6216\u9886\u5bfc\u7b49\u54a8\u8be2\u3002<\/p>\n<h3>\u8bf7\u53c2\u8003\u4ee5\u4e0b\u7684\u8d44\u6599\u3002<\/h3>\n<p>&nbsp;<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u9996\u5148 \u5728\u73b0\u573a\u6709\u4eba\u5728Git\u64cd\u4f5c\u4e2d\uff0c\u867d\u7136\u4e86\u89e3pull\uff0c\u4f46\u5bf9rebase\u662f\u4ec0\u4e48\u5e76\u4e0d\u6e05\u695a\u3002 \u5728\u672c\u6587\u4e2d\uff0c\u6211\u5c06\u89e3\u91cagit  [&hellip;]<\/p>\n","protected":false},"author":10,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37846","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"<!-- This site is optimized with the Yoast SEO Premium plugin v21.5 (Yoast SEO v21.5) - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git pull\u548cgit pull -rebase\u6709\u4ec0\u4e48\u533a\u522b\uff1f - Blog - Silicon Cloud<\/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.silicloud.com\/zh\/blog\/\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git-pull\u548cgit-pull-r\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git pull\u548cgit pull --rebase\u6709\u4ec0\u4e48\u533a\u522b\uff1f\" \/>\n<meta property=\"og:description\" content=\"\u9996\u5148 \u5728\u73b0\u573a\u6709\u4eba\u5728Git\u64cd\u4f5c\u4e2d\uff0c\u867d\u7136\u4e86\u89e3pull\uff0c\u4f46\u5bf9rebase\u662f\u4ec0\u4e48\u5e76\u4e0d\u6e05\u695a\u3002 \u5728\u672c\u6587\u4e2d\uff0c\u6211\u5c06\u89e3\u91cagit [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git-pull\u548cgit-pull-r\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2024-01-17T05:36:32+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T05:50:05+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d305d37434c4406c5ba18\/23-0.png\" \/>\n<meta name=\"author\" content=\"\u5b87, \u534e\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u5b87, \u534e\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"1 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/\",\"name\":\"\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git pull\u548cgit pull -rebase\u6709\u4ec0\u4e48\u533a\u522b\uff1f - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2024-01-17T05:36:32+00:00\",\"dateModified\":\"2024-04-29T05:50:05+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/513018e4e121d3add1b7c5de8be21458\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git pull\u548cgit pull &#8211;rebase\u6709\u4ec0\u4e48\u533a\u522b\uff1f\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/513018e4e121d3add1b7c5de8be21458\",\"name\":\"\u5b87, \u534e\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/63cd45cbc05a35fc4ff7637a163c83c4962ef58d27472726c3a3e0c9c5194f0f?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/63cd45cbc05a35fc4ff7637a163c83c4962ef58d27472726c3a3e0c9c5194f0f?s=96&d=mm&r=g\",\"caption\":\"\u5b87, \u534e\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yuhua\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git pull\u548cgit pull -rebase\u6709\u4ec0\u4e48\u533a\u522b\uff1f - Blog - Silicon Cloud","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.silicloud.com\/zh\/blog\/\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git-pull\u548cgit-pull-r\/","og_locale":"zh_CN","og_type":"article","og_title":"\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git pull\u548cgit pull --rebase\u6709\u4ec0\u4e48\u533a\u522b\uff1f","og_description":"\u9996\u5148 \u5728\u73b0\u573a\u6709\u4eba\u5728Git\u64cd\u4f5c\u4e2d\uff0c\u867d\u7136\u4e86\u89e3pull\uff0c\u4f46\u5bf9rebase\u662f\u4ec0\u4e48\u5e76\u4e0d\u6e05\u695a\u3002 \u5728\u672c\u6587\u4e2d\uff0c\u6211\u5c06\u89e3\u91cagit [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git-pull\u548cgit-pull-r\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2024-01-17T05:36:32+00:00","article_modified_time":"2024-04-29T05:50:05+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d305d37434c4406c5ba18\/23-0.png"}],"author":"\u5b87, \u534e","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u5b87, \u534e","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/","name":"\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git pull\u548cgit pull -rebase\u6709\u4ec0\u4e48\u533a\u522b\uff1f - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2024-01-17T05:36:32+00:00","dateModified":"2024-04-29T05:50:05+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/513018e4e121d3add1b7c5de8be21458"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u5982\u679c\u4f60\u77e5\u9053\u4e86\uff0c\u90a3\u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5c31\u65e0\u654c\u4e86\uff01git pull\u548cgit pull &#8211;rebase\u6709\u4ec0\u4e48\u533a\u522b\uff1f"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/513018e4e121d3add1b7c5de8be21458","name":"\u5b87, \u534e","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/63cd45cbc05a35fc4ff7637a163c83c4962ef58d27472726c3a3e0c9c5194f0f?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/63cd45cbc05a35fc4ff7637a163c83c4962ef58d27472726c3a3e0c9c5194f0f?s=96&d=mm&r=g","caption":"\u5b87, \u534e"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yuhua\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%a6%82%e6%9e%9c%e4%bd%a0%e7%9f%a5%e9%81%93%e4%ba%86%ef%bc%8c%e9%82%a3%e5%9c%a8%e5%ae%9e%e9%99%85%e5%b7%a5%e4%bd%9c%e4%b8%ad%e5%b0%b1%e6%97%a0%e6%95%8c%e4%ba%86%ef%bc%81git-pull%e5%92%8cgit-pull-r\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37846","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/10"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37846"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37846\/revisions"}],"predecessor-version":[{"id":85651,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37846\/revisions\/85651"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37846"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37846"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37846"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}