{"id":37505,"date":"2024-01-09T06:23:07","date_gmt":"2023-06-02T16:38:47","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/"},"modified":"2024-05-04T17:28:11","modified_gmt":"2024-05-04T09:28:11","slug":"git%e5%a4%87%e5%bf%98%e5%bd%95-2","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/","title":{"rendered":"Git\u5907\u5fd8\u5f55"},"content":{"rendered":"

\u8fdc\u7a0b\u4ed3\u5e93 \u2192 remote
\n\u672c\u5730\u4ed3\u5e93 \u2192 local<\/p>\n

\u547d\u4ee4\u63d0\u793a\u7b26\u3002<\/h1>\n
\n
\u30b3\u30de\u30f3\u30c9\u5185\u5bb9cloneremote\u3092\u30de\u30a6\u30f3\u30c8remote -vremote\u78ba\u8a8dbranchlocal\u30d6\u30e9\u30f3\u30c1\u4f5c\u6210pushlocal\u2192remotepullremote\u2192localstashlocal\u5909\u66f4\u9000\u907f<\/div>\n<\/div>\n

\u7ecf\u5e38\u4f7f\u7528\u7684\u6d41\u7a0b<\/h1>\n

\u5c06\u5206\u652f\uff08branch\uff09\u7684\u66f4\u6539\u540c\u6b65\u5230\u4e3b\u5206\u652f\uff08master\uff09\u3002<\/h2>\n

\u83b7\u53d6\u6700\u65b0\u4fe1\u606f<\/p>\n

git pull origin master\r\n<\/code><\/pre>\n
\u5207\u6362\u5206\u652f<\/p>\n
git rebase master\r\n<\/code><\/pre>\n
\u53d6\u6d88\u672c\u5730\u7684 commit<\/h2>\n
\u786e\u8ba4\u76f8\u5e94\u7684commit\u7684ID\u3002<\/p>\n
git log\r\n<\/code><\/pre>\n
\u6307\u5b9aID\u540e\u8fdb\u884c\u5220\u9664<\/p>\n
git reset --hard <commitId>\r\n<\/code><\/pre>\n
\u5220\u9664\u672c\u5730\u5206\u652f<\/h2>\n
\u8bf7\u6309\u7167\u8fd9\u4e2a\u6837\u5b50\u505a\u3002<\/p>\n
\u5f53\u9047\u5230\u56f0\u5883\u65f6<\/h1>\n
\u65e0\u6cd5\u63a8\u9001\u4e00\u4e9b\u5f15\u7528\u81f3\u3002<\/h2>\n
\u5f53\u5728\u8fdb\u884c\u91cd\u65b0\u7f16\u7801\u65f6\uff0c\u5982\u679c\u51fa\u73b0\u4e86\u4e00\u4e9b\u4e0d\u7b26\u5408\u903b\u8f91\u7684\u95ee\u9898\uff0c\u5bfc\u81f4\u65e0\u6cd5\u8fdb\u884c\u63a8\u9001\u3002<\/p>\n
error: failed to push some refs to  '\u30ea\u30dd\u30b8\u30c8\u30ea\u30d1\u30b9'\r\n<\/code><\/pre>\n
\u5982\u679c\u51fa\u73b0\u8fd9\u6837\u7684\u9519\u8bef<\/p>\n
git push origin :<branch name>\r\n<\/code><\/pre>\n
\u53ea\u662f\u9488\u5bf9local\u4e3a\u6b63\u7684\u60c5\u51b5\u6765\u89e3\u51b3\u95ee\u9898\u3002<\/p>\n
\u91cd\u65b0\u57fa\u51c6\u5e94\u7528<\/h2>\n
\u65e0\u6cd5\u8fdb\u884crebase\u3002<\/p>\n
It seems that there is already a rebase-apply directory, and\r\nI wonder if you are in the middle of another rebase.  If that is the\r\ncase, please try\r\n        git rebase (--continue | --abort | --skip)\r\nIf that is not the case, please\r\n        rm -fr \"hoge\/fuga\/rebase-apply\"\r\nand run me again.  I am stopping in case you still have something\r\nvaluable there.\r\n<\/code><\/pre>\n
\u56e0\u4e3a\u6709”rebase-apply”\u7684\u6587\u4ef6\u5939\uff0c\u6240\u4ee5\u65e0\u6cd5\u8fdb\u884c\u3002
\n\u6240\u4ee5\u53ea\u9700\u5220\u9664\u76f8\u5173\u6587\u4ef6\u5939\uff0c\u7136\u540e\u91cd\u65b0\u8fd0\u884c\u5c31\u53ef\u4ee5\u5b8c\u6210\u3002
\n\u53ef\u80fd\u662f\u56e0\u4e3a\u5904\u7406\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u4e86\u505c\u6ede\u7b49\u95ee\u9898\uff0c\u5982\u679c\u6709\u6b8b\u7559\uff0c\u90a3\u4e48\u53ef\u80fd\u4f1a\u53d1\u751f\u8fd9\u79cd\u60c5\u51b5\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
\u8fdc\u7a0b\u4ed3\u5e93 \u2192 remote \u672c\u5730\u4ed3\u5e93 \u2192 local \u547d\u4ee4\u63d0\u793a\u7b26\u3002 \u30b3\u30de\u30f3\u30c9\u5185\u5bb9cloneremote\u3092\u30de\u30a6\u30f3 […]<\/p>\n","protected":false},"author":7,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37505","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\nGit\u5907\u5fd8\u5f55 - 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\/git\u5907\u5fd8\u5f55-2\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git\u5907\u5fd8\u5f55\" \/>\n<meta property=\"og:description\" content=\"\u8fdc\u7a0b\u4ed3\u5e93 \u2192 remote \u672c\u5730\u4ed3\u5e93 \u2192 local \u547d\u4ee4\u63d0\u793a\u7b26\u3002 \u30b3\u30de\u30f3\u30c9\u5185\u5bb9cloneremote\u3092\u30de\u30a6\u30f3 […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u5907\u5fd8\u5f55-2\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-06-02T16:38:47+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-04T09:28:11+00:00\" \/>\n<meta name=\"author\" content=\"\u79d1, \u9896\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u79d1, \u9896\" \/>\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\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/\",\"name\":\"Git\u5907\u5fd8\u5f55 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-06-02T16:38:47+00:00\",\"dateModified\":\"2024-05-04T09:28:11+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/8ca01ba7f7362ad4edb7da206a12f29e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\u5907\u5fd8\u5f55\"}]},{\"@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\/8ca01ba7f7362ad4edb7da206a12f29e\",\"name\":\"\u79d1, \u9896\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/8a6fb3cc7ba2f69d2189ba532aec4633ea7ed75ac0af162ec367cb3abc0fb2af?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/8a6fb3cc7ba2f69d2189ba532aec4633ea7ed75ac0af162ec367cb3abc0fb2af?s=96&d=mm&r=g\",\"caption\":\"\u79d1, \u9896\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/keying\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git\u5907\u5fd8\u5f55 - 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\/git\u5907\u5fd8\u5f55-2\/","og_locale":"zh_CN","og_type":"article","og_title":"Git\u5907\u5fd8\u5f55","og_description":"\u8fdc\u7a0b\u4ed3\u5e93 \u2192 remote \u672c\u5730\u4ed3\u5e93 \u2192 local \u547d\u4ee4\u63d0\u793a\u7b26\u3002 \u30b3\u30de\u30f3\u30c9\u5185\u5bb9cloneremote\u3092\u30de\u30a6\u30f3 […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u5907\u5fd8\u5f55-2\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-06-02T16:38:47+00:00","article_modified_time":"2024-05-04T09:28:11+00:00","author":"\u79d1, \u9896","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u79d1, \u9896","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/","name":"Git\u5907\u5fd8\u5f55 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-06-02T16:38:47+00:00","dateModified":"2024-05-04T09:28:11+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/8ca01ba7f7362ad4edb7da206a12f29e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git\u5907\u5fd8\u5f55"}]},{"@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\/8ca01ba7f7362ad4edb7da206a12f29e","name":"\u79d1, \u9896","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/8a6fb3cc7ba2f69d2189ba532aec4633ea7ed75ac0af162ec367cb3abc0fb2af?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/8a6fb3cc7ba2f69d2189ba532aec4633ea7ed75ac0af162ec367cb3abc0fb2af?s=96&d=mm&r=g","caption":"\u79d1, \u9896"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/keying\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%a4%87%e5%bf%98%e5%bd%95-2\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37505","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\/7"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37505"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37505\/revisions"}],"predecessor-version":[{"id":99689,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37505\/revisions\/99689"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37505"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37505"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37505"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}