{"id":37396,"date":"2023-05-30T22:44:34","date_gmt":"2022-11-13T10:27:09","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/"},"modified":"2024-04-30T06:40:49","modified_gmt":"2024-04-29T22:40:49","slug":"%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/","title":{"rendered":"\u4e0d\u8fdb\u884cgit pull\u800c\u662f\u6267\u884cgit up"},"content":{"rendered":"<p>\u4f7f\u7528git pull\u547d\u4ee4\u65f6\uff0c\u5982\u679c\u8fdc\u7a0b\u6709\u66f4\u6539\uff0c\u6211\u4e4b\u524d\u4f1a\u9009\u62e9\u4f7f\u7528merge\u63d0\u4ea4\u6765\u5408\u5e76\u4ee3\u7801\uff0c\u5bfc\u81f4\u4ee3\u7801\u6811\u53d8\u5f97\u51cc\u4e71\u3002\u4f46\u662f\uff0c\u6211\u53d1\u73b0\u4f7f\u7528\u4e00\u4e2a\u53eb\u505agit-up\u7684\u5de5\u5177\uff0c\u5f53\u65e0\u6cd5\u8fdb\u884cfast-forward\u5408\u5e76\u65f6\uff0c\u5b83\u4f1a\u81ea\u52a8\u5e2e\u6211\u8fdb\u884crebase\u64cd\u4f5c\uff0c\u975e\u5e38\u65b9\u4fbf\u3002aanand\/git-up<\/p>\n<blockquote><p>git pull\u6709\u4e24\u4e2a\u95ee\u9898:<\/p>\n<p>\u9ed8\u8ba4\u60c5\u51b5\u4e0b\uff0c\u5b83\u4f1a\u5408\u5e76\u4e0a\u6e38\u7684\u66f4\u6539\uff0c\u800c\u66f4\u597d\u7684\u65b9\u5f0f\u662f\u5728\u5176\u4e0a\u8fdb\u884c\u53d8\u57fa\uff0c\u9664\u975e\u4f60\u7684\u534f\u4f5c\u8005\u559c\u6b22\u6709\u70b9\u4e71\u7cdf\u7cdf\u7684\u63d0\u4ea4\u56fe\u3002<br \/>\n\u5b83\u53ea\u66f4\u65b0\u4f60\u5f53\u524d\u6240\u5728\u7684\u5206\u652f\uff0c\u8fd9\u610f\u5473\u7740\u5f53\u4f60\u4e0d\u7279\u522b\u5173\u5fc3\u5f53\u524d\u5206\u652f\u4e4b\u5916\u7684\u5176\u4ed6\u5206\u652f\u65f6\uff0cgit push\u4f1a\u8b66\u544a\u4f60\u843d\u540e\u4e8e\u8fd9\u4e9b\u5206\u652f\u3002<\/p><\/blockquote>\n<p>\u5b89\u88c5 gem git-up \u540e\u7acb\u5373\u53ef\u4f7f\u7528\u3002<\/p>\n<p>\u5728\u5408\u5e76\u8fdc\u7a0b\u66f4\u6539\u65f6\uff0c\u6539\u4e3a\u4f7f\u7528git up\u547d\u4ee4\u800c\u4e0d\u662fgit pull\u547d\u4ee4\u8fdb\u884c\u6267\u884c\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8 2014-09-11 13.08.00.png\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2e3b37434c4406c53b00\/4-0.png\" alt=\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8 2014-09-11 13.08.00.png\" \/><\/div>\n<p>\u2191\u6211\u80fd\u591f\u81ea\u52a8\u5730\u5c06master\u8fdb\u884crebase\u64cd\u4f5c\u3002\u800c\u4e14\uff0c\u9664\u4e86\u5f53\u524d\u5206\u652f\u5916\uff0c\u8fd8\u4e3a\u6211\u8fdb\u884cpull\/rebase\u64cd\u4f5c\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8 2014-09-11 13.24.35.png\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2e3b37434c4406c53b00\/6-0.png\" alt=\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8 2014-09-11 13.24.35.png\" \/><\/div>\n<p>\u5982\u679c\u53ea\u662f\u4f7f\u7528pull\/rebase\u547d\u4ee4\u7684\u533a\u522b\uff0c\u6211\u89c9\u5f97\u53ef\u4ee5\u9009\u62e9\u5728pull\u547d\u4ee4\u4e0a\u52a0\u4e0a&#8211;rebase\u9009\u9879\uff0c\u4f46\u9664\u6b64\u4e4b\u5916\u8fd8\u6709\u5176\u4ed6\u65b9\u4fbf\u7684\u529f\u80fd\u4e5f\u662f\u5f88\u597d\u7684\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u4f7f\u7528git pull\u547d\u4ee4\u65f6\uff0c\u5982\u679c\u8fdc\u7a0b\u6709\u66f4\u6539\uff0c\u6211\u4e4b\u524d\u4f1a\u9009\u62e9\u4f7f\u7528merge\u63d0\u4ea4\u6765\u5408\u5e76\u4ee3\u7801\uff0c\u5bfc\u81f4\u4ee3\u7801\u6811\u53d8\u5f97\u51cc\u4e71\u3002\u4f46\u662f [&hellip;]<\/p>\n","protected":false},"author":11,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37396","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>\u4e0d\u8fdb\u884cgit pull\u800c\u662f\u6267\u884cgit up - 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\/\u4e0d\u8fdb\u884cgit-pull\u800c\u662f\u6267\u884cgit-up\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u4e0d\u8fdb\u884cgit pull\u800c\u662f\u6267\u884cgit up\" \/>\n<meta property=\"og:description\" content=\"\u4f7f\u7528git pull\u547d\u4ee4\u65f6\uff0c\u5982\u679c\u8fdc\u7a0b\u6709\u66f4\u6539\uff0c\u6211\u4e4b\u524d\u4f1a\u9009\u62e9\u4f7f\u7528merge\u63d0\u4ea4\u6765\u5408\u5e76\u4ee3\u7801\uff0c\u5bfc\u81f4\u4ee3\u7801\u6811\u53d8\u5f97\u51cc\u4e71\u3002\u4f46\u662f [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u4e0d\u8fdb\u884cgit-pull\u800c\u662f\u6267\u884cgit-up\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2022-11-13T10:27:09+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T22:40:49+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2e3b37434c4406c53b00\/4-0.png\" \/>\n<meta name=\"author\" content=\"\u65b0, \u97f5\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u65b0, \u97f5\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/\",\"name\":\"\u4e0d\u8fdb\u884cgit pull\u800c\u662f\u6267\u884cgit up - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2022-11-13T10:27:09+00:00\",\"dateModified\":\"2024-04-29T22:40:49+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u4e0d\u8fdb\u884cgit pull\u800c\u662f\u6267\u884cgit up\"}]},{\"@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\/4ba4019495123db3038fd0809e6959c9\",\"name\":\"\u65b0, \u97f5\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g\",\"caption\":\"\u65b0, \u97f5\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunxin\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u4e0d\u8fdb\u884cgit pull\u800c\u662f\u6267\u884cgit up - 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\/\u4e0d\u8fdb\u884cgit-pull\u800c\u662f\u6267\u884cgit-up\/","og_locale":"zh_CN","og_type":"article","og_title":"\u4e0d\u8fdb\u884cgit pull\u800c\u662f\u6267\u884cgit up","og_description":"\u4f7f\u7528git pull\u547d\u4ee4\u65f6\uff0c\u5982\u679c\u8fdc\u7a0b\u6709\u66f4\u6539\uff0c\u6211\u4e4b\u524d\u4f1a\u9009\u62e9\u4f7f\u7528merge\u63d0\u4ea4\u6765\u5408\u5e76\u4ee3\u7801\uff0c\u5bfc\u81f4\u4ee3\u7801\u6811\u53d8\u5f97\u51cc\u4e71\u3002\u4f46\u662f [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u4e0d\u8fdb\u884cgit-pull\u800c\u662f\u6267\u884cgit-up\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2022-11-13T10:27:09+00:00","article_modified_time":"2024-04-29T22:40:49+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2e3b37434c4406c53b00\/4-0.png"}],"author":"\u65b0, \u97f5","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u65b0, \u97f5"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/","name":"\u4e0d\u8fdb\u884cgit pull\u800c\u662f\u6267\u884cgit up - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2022-11-13T10:27:09+00:00","dateModified":"2024-04-29T22:40:49+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u4e0d\u8fdb\u884cgit pull\u800c\u662f\u6267\u884cgit up"}]},{"@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\/4ba4019495123db3038fd0809e6959c9","name":"\u65b0, \u97f5","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g","caption":"\u65b0, \u97f5"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunxin\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e8%bf%9b%e8%a1%8cgit-pull%e8%80%8c%e6%98%af%e6%89%a7%e8%a1%8cgit-up\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37396","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\/11"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37396"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37396\/revisions"}],"predecessor-version":[{"id":90316,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37396\/revisions\/90316"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37396"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37396"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37396"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}