{"id":37501,"date":"2023-03-18T11:36:53","date_gmt":"2023-04-26T12:39:12","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/"},"modified":"2024-04-29T19:26:50","modified_gmt":"2024-04-29T11:26:50","slug":"%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/","title":{"rendered":"\u6709\u5173Git\u7684\u5efa\u8bae"},"content":{"rendered":"<h3>\u5f53\u4eceGit\u4ed3\u5e93\u4e2d\u5220\u9664\u6587\u4ef6\u65f6\uff0c\u8981\u5e94\u7528\u66f4\u6539<\/h3>\n<p>git rm filename.txt<\/p>\n<p>filename.txt\u3092\u524a\u9664\u3059\u308b\u3002<\/p>\n<p>git rm &#8211;cached filename.txt<\/p>\n<p>filename.txt\u3092\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u304b\u3089\u6d88\u3059\uff08\u30d5\u30a9\u30eb\u30c0\u4e0a\u306b\u306f\u6b8b\u3063\u305f\u307e\u307e\uff09<\/p>\n<p>git add -u<\/p>\n<p>\u5168\u524a\u9664\u30d5\u30a1\u30a4\u30eb\u3092\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u306b\u53cd\u6620\u3059\u308b\u3002<\/p>\n<p>https:\/\/stackoverflow.com\/questions\/12373733\/%E5%86%85%E5%81%A5%E9%A1%B9%E7%9B%AE-%E8%A2%AB%E5%88%A0%E9%99%A4%E6%96%87%E4%BB%B6<\/p>\n<h3>\u5728\u77ac\u95f4\u89e3\u51b3\u5408\u5e76\u51b2\u7a81\u7684\u60c5\u51b5\u4e0b<\/h3>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">VScode\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8 \u306e\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u958b\u304f\u3002\u30b3\u30f3\u30d5\u30ea\u30af\u30c8 \u306e\u3042\u308b\u7b87\u6240\u3067\u300c\u30de\u30fc\u30b8\u3059\u308b\u5074\u306e\u5909\u66f4\u3092\u9069\u7528\u3059\u308b\u300d\u300c\u30de\u30fc\u30b8\u3055\u308c\u308b\u5074\u306e\u5909\u66f4\u3092\u9069\u7528\u3059\u308b\u300d\u300c\u4e21\u65b9\u306e\u5074\u306e\u5909\u66f4\u3092\u9069\u7528\u3059\u308b\u300d\u3068\u3044\u3046\u9078\u629e\u80a2\u304c\u9078\u3079\u308b\u3002<\/ul>\n<\/li>\n<\/ul>\n<p>\u30b9\u30af\u30ea\u30d7\u30c8\u3067\u5bfe\u51e6<\/p>\n<blockquote class=\"wp-embedded-content\" data-secret=\"0Ky6lRVQ1u\"><p><a href=\"https:\/\/easyengine.io\/tutorials\/git\/git-resolve-merge-conflicts\/\">Git &#8211; Resolve Merge Conflicts<\/a><\/p><\/blockquote>\n<p><iframe loading=\"lazy\" class=\"wp-embedded-content\" sandbox=\"allow-scripts\" security=\"restricted\" style=\"position: absolute; clip: rect(1px, 1px, 1px, 1px);\" title=\"&#8220;Git &#8211; Resolve Merge Conflicts&#8221; &#8212; EasyEngine\" src=\"https:\/\/easyengine.io\/tutorials\/git\/git-resolve-merge-conflicts\/embed\/#?secret=Vxcj3yO78x#?secret=0Ky6lRVQ1u\" data-secret=\"0Ky6lRVQ1u\" width=\"500\" height=\"282\" frameborder=\"0\" marginwidth=\"0\" marginheight=\"0\" scrolling=\"no\"><\/iframe><br \/>\n\u57fa\u672c\u30a2\u30a4\u30c7\u30a3\u30a2\u3068\u3057\u3066\u306f\u3001&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;\u306a\u3069\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u3042\u308b\u7b87\u6240\u306e\u6587\u5b57\u5217\u3067\u691c\u7d22\u3057\u30b3\u30f3\u30d5\u30ea\u30af\u30c8 \u306e\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u6d17\u3044\u51fa\u3059\u3000\u2192 git checkout &#8211;ours PATH\/FILE\u307e\u305f\u306fgit checkout &#8211;theirs PATH\/FILE\u3067\u3069\u3061\u3089\u304b\u306e\u5909\u66f4\u3092\u53d7\u3051\u5165\u308c\u308b\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u5f53\u4eceGit\u4ed3\u5e93\u4e2d\u5220\u9664\u6587\u4ef6\u65f6\uff0c\u8981\u5e94\u7528\u66f4\u6539 git rm filename.txt filename.txt\u3092\u524a\u9664 [&hellip;]<\/p>\n","protected":false},"author":6,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37501","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>\u6709\u5173Git\u7684\u5efa\u8bae - 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\/\u6709\u5173git\u7684\u5efa\u8bae\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u6709\u5173Git\u7684\u5efa\u8bae\" \/>\n<meta property=\"og:description\" content=\"\u5f53\u4eceGit\u4ed3\u5e93\u4e2d\u5220\u9664\u6587\u4ef6\u65f6\uff0c\u8981\u5e94\u7528\u66f4\u6539 git rm filename.txt filename.txt\u3092\u524a\u9664 [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u6709\u5173git\u7684\u5efa\u8bae\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-04-26T12:39:12+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T11:26:50+00:00\" \/>\n<meta name=\"author\" content=\"\u6587, \u7fd4\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u6587, \u7fd4\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/\",\"name\":\"\u6709\u5173Git\u7684\u5efa\u8bae - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-04-26T12:39:12+00:00\",\"dateModified\":\"2024-04-29T11:26:50+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u6709\u5173Git\u7684\u5efa\u8bae\"}]},{\"@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\/64d5cc7727fffbff2f9a2a8da1de3e5c\",\"name\":\"\u6587, \u7fd4\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g\",\"caption\":\"\u6587, \u7fd4\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/wenxiang\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u6709\u5173Git\u7684\u5efa\u8bae - 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\/\u6709\u5173git\u7684\u5efa\u8bae\/","og_locale":"zh_CN","og_type":"article","og_title":"\u6709\u5173Git\u7684\u5efa\u8bae","og_description":"\u5f53\u4eceGit\u4ed3\u5e93\u4e2d\u5220\u9664\u6587\u4ef6\u65f6\uff0c\u8981\u5e94\u7528\u66f4\u6539 git rm filename.txt filename.txt\u3092\u524a\u9664 [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u6709\u5173git\u7684\u5efa\u8bae\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-04-26T12:39:12+00:00","article_modified_time":"2024-04-29T11:26:50+00:00","author":"\u6587, \u7fd4","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u6587, \u7fd4"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/","name":"\u6709\u5173Git\u7684\u5efa\u8bae - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-04-26T12:39:12+00:00","dateModified":"2024-04-29T11:26:50+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u6709\u5173Git\u7684\u5efa\u8bae"}]},{"@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\/64d5cc7727fffbff2f9a2a8da1de3e5c","name":"\u6587, \u7fd4","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g","caption":"\u6587, \u7fd4"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/wenxiang\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%9c%89%e5%85%b3git%e7%9a%84%e5%bb%ba%e8%ae%ae\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37501","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\/6"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37501"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37501\/revisions"}],"predecessor-version":[{"id":87184,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37501\/revisions\/87184"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37501"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37501"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37501"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}