{"id":9494,"date":"2025-10-09T15:43:14","date_gmt":"2025-10-09T06:43:14","guid":{"rendered":"https:\/\/code-plus.jp\/gp\/?p=9494"},"modified":"2025-10-09T15:43:14","modified_gmt":"2025-10-09T06:43:14","slug":"delete-conflicted-9494","status":"publish","type":"post","link":"https:\/\/code-plus.jp\/gp\/delete-conflicted-9494\/","title":{"rendered":"Mac\u306e\u30bf\u30fc\u30df\u30ca\u30eb \/ Windows \u30b3\u30de\u30f3\u30c9\u30d7\u30ed\u30f3\u30d7\u30c8\u3067<br>[conflicted]\u30d5\u30a1\u30a4\u30eb\u3092\u4e00\u62ec\u524a\u9664\u3059\u308b\u65b9\u6cd5\uff08\u30b5\u30d6\u30d5\u30a9\u30eb\u30c0\u5bfe\u5fdc\uff09"},"content":{"rendered":"<p>pCloud\u3084Dropbox\u3001iCloud\u306a\u3069\u306e\u30af\u30e9\u30a6\u30c9\u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u4f7f\u7528\u3057\u3066\u3044\u308b\u3068\u3001\u540c\u671f\u306e\u7af6\u5408\u306b\u3088\u308a\u300c<code>[conflicted]<\/code>\u300d\u3084\u300c<code>[conflicted 2]<\/code>\u300d\u3068\u3044\u3063\u305f\u6587\u5b57\u5217\u304c\u81ea\u52d5\u7684\u306b\u30d5\u30a1\u30a4\u30eb\u540d\u306b\u8ffd\u52a0\u3055\u308c\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<p>\u3053\u308c\u3089\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u8907\u6570\u306e\u30b5\u30d6\u30d5\u30a9\u30eb\u30c0\u306b\u6563\u3089\u3070\u3063\u3066\u3044\u308b\u3068\u3001\u624b\u52d5\u3067\u306e\u524a\u9664\u306f\u975e\u5e38\u306b\u624b\u9593\u304c\u304b\u304b\u308a\u307e\u3059\u3002\u3053\u306e\u8a18\u4e8b\u3067\u306f\u3001Mac\u306e\u30bf\u30fc\u30df\u30ca\u30eb\u3092\u4f7f\u3063\u3066\u3001\u30b5\u30d6\u30d5\u30a9\u30eb\u30c0\u3092\u542b\u3080\u3059\u3079\u3066\u306e<code>[conflicted]<\/code>\u30d5\u30a1\u30a4\u30eb\u3092\u5b89\u5168\u304b\u3064\u52b9\u7387\u7684\u306b\u4e00\u62ec\u524a\u9664\u3059\u308b\u65b9\u6cd5\u3092\u7d39\u4ecb\u3057\u307e\u3059\u3002<\/p>\n\n <!-- \u2605\u76ee\u6b21\u30ea\u30b9\u30c8 -->\n<ul class=\"tocList mt-1r\" data-toc-id=\"js-tocBWGD\" style=\"height:28rem\"><\/ul>\n<ins class=\"tocBtn is-fixed\" data-toc-id=\"js-tocBWGD\"><\/ins>\n\n\n\n\n\n\n\n<h2 class=\"fz-xl\"><code>[conflicted]<\/code>\u30d5\u30a1\u30a4\u30eb\u3068\u306f\uff1f<\/h2>\n<p>\u30af\u30e9\u30a6\u30c9\u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u3067\u306f\u3001\u8907\u6570\u306e\u30c7\u30d0\u30a4\u30b9\u304b\u3089\u540c\u3058\u30d5\u30a1\u30a4\u30eb\u3092\u540c\u6642\u306b\u7de8\u96c6\u3059\u308b\u3068\u3001\u540c\u671f\u306e\u7af6\u5408\u304c\u767a\u751f\u3057\u307e\u3059\u3002\u3053\u306e\u969b\u3001\u5143\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u4fdd\u8b77\u3059\u308b\u305f\u3081\u306b\u3001\u7af6\u5408\u3057\u305f\u30d0\u30fc\u30b8\u30e7\u30f3\u306b<code>[conflicted]<\/code>\u3068\u3044\u3046\u6587\u5b57\u5217\u304c\u81ea\u52d5\u7684\u306b\u4ed8\u52a0\u3055\u308c\u307e\u3059\u3002<\/p>\n\n<h4 class=\"fz-md\">\u767a\u751f\u3059\u308b\u4e3b\u306a\u30b1\u30fc\u30b9<\/h4>\n<ul style=\"list-style-type:bullet;\">\n  <li>\u8907\u6570\u306e\u30c7\u30d0\u30a4\u30b9\u3067\u30aa\u30d5\u30e9\u30a4\u30f3\u7de8\u96c6\u5f8c\u306b\u540c\u671f<\/li>\n  <li>\u540c\u671f\u5b8c\u4e86\u524d\u306b\u5225\u30c7\u30d0\u30a4\u30b9\u3067\u540c\u3058\u30d5\u30a1\u30a4\u30eb\u3092\u4fdd\u5b58<\/li>\n  <li>\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u4e0d\u5b89\u5b9a\u306b\u3088\u308b\u540c\u671f\u30a8\u30e9\u30fc<\/li>\n  <li>\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0\u3068\u306e\u4f75\u7528\u6642<\/li>\n<\/ul>\n\n<hr class=\"separator mx-auto mt-3r\" \/>\n\n<h2 class=\"fz-xl\">Mac\u74b0\u5883\u3067\u306e\u5b9f\u884c\u65b9\u6cd5<\/h2>\n\n<h3 class=\"fz-ml\">\u4e8b\u524d\u6e96\u5099\uff1a\u5bfe\u8c61\u30d5\u30a1\u30a4\u30eb\u306e\u78ba\u8a8d<\/h3>\n\n<p>\u524a\u9664\u3092\u5b9f\u884c\u3059\u308b\u524d\u306b\u3001\u3069\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u524a\u9664\u5bfe\u8c61\u306b\u306a\u308b\u306e\u304b\u78ba\u8a8d\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n\n<h4 class=\"fz-md\">\u30bf\u30fc\u30df\u30ca\u30eb\u3067\u5bfe\u8c61\u30d5\u30a1\u30a4\u30eb\u3092\u4e00\u89a7\u8868\u793a<\/h4>\n<pre><code class=\"language-bash\">find &quot;\/path\/to\/directory&quot; -type f -name &#39;*\\[conflicted*&#39;\n<\/code><\/pre>\n<p><b class=\"fw-600\">\u91cd\u8981\u30dd\u30a4\u30f3\u30c8\uff1a<\/b><\/p>\n<ul style=\"list-style-type:bullet;\">\n  <li><code>[conflicted]<\/code>\u306e\u89d2\u62ec\u5f27\u306f\u7279\u6b8a\u6587\u5b57\u306e\u305f\u3081\u3001\u30d0\u30c3\u30af\u30b9\u30e9\u30c3\u30b7\u30e5 <code>\\<\/code> \u3067\u30a8\u30b9\u30b1\u30fc\u30d7\u304c\u5fc5\u8981<\/li>\n  <li>\u30d1\u30b9\u306b\u30b9\u30da\u30fc\u30b9\u3084\u62ec\u5f27\u304c\u542b\u307e\u308c\u308b\u5834\u5408\u306f\u3001\u30c0\u30d6\u30eb\u30af\u30a9\u30fc\u30c8 <code>&quot;<\/code> \u3067\u56f2\u3080<\/li>\n<\/ul>\n\n<h4 class=\"fz-md\">\u30d5\u30a1\u30a4\u30eb\u6570\u3092\u30ab\u30a6\u30f3\u30c8<\/h4>\n<pre><code class=\"language-bash\">find &quot;\/path\/to\/directory&quot; -type f -name &#39;*\\[conflicted*&#39; | wc -l\n<\/code><\/pre>\n\n<h4 class=\"fz-md\">\u5b9f\u884c\u4f8b<\/h4>\n<pre><code class=\"language-bash\">find &quot;\/Users\/pCloud Drive\/MyProject&quot; -type f -name &#39;*\\[conflicted*&#39;\n<\/code><\/pre>\n<p>\u51fa\u529b\u4f8b\uff1a<\/p>\n<pre><code class=\"language-\">\/Users\/pCloud Drive\/MyProject\/analytics [conflicted].php\n\/Users\/pCloud Drive\/MyProject\/demo-pageband [conflicted 2].html\n<\/code><\/pre>\n\n\n<h3 class=\"fz-ml\">\u30bf\u30fc\u30df\u30ca\u30eb\u30b7\u30a7\u30eb\u7528\u30b7\u30a7\u30eb\u30b9\u30af\u30ea\u30d7\u30c8\uff08delete_conflicted.sh\uff09<\/h3>\n<p>\u4ee5\u4e0b\u306e\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u4f7f\u7528\u3059\u308b\u3053\u3068\u3067\u3001\u5b89\u5168\u304b\u3064\u52b9\u7387\u7684\u306b<code>[conflicted]<\/code>\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3067\u304d\u307e\u3059\u3002<\/p>\n\n<h4 class=\"fz-md\">\u30b9\u30af\u30ea\u30d7\u30c8\u5168\u6587\n<\/h4>\n<pre><code class=\"language-bash\">#!\/bin\/bash\n\n# delete_conflicted.sh\uff08Mac \u30bf\u30fc\u30df\u30ca\u30eb\u7528\uff09\n# \u4f7f\u7528\u65b9\u6cd5:\n# \u57fa\u672c\uff08conflicted\u30d5\u30a1\u30a4\u30eb\u306e\u307f\uff09:\n#   .\/delete_conflicted.sh &quot;\/path\/to\/directory&quot;\n# .DS_Store\u3068Thumbs.db\u3082\u524a\u9664:\n#   .\/delete_conflicted.sh -a &quot;\/path\/to\/directory&quot;\n\n# \u30aa\u30d7\u30b7\u30e7\u30f3\u89e3\u6790\nDELETE_SYSTEM_FILES=false\nwhile getopts &quot;a&quot; opt; do\n    case $opt in\n        a)\n            DELETE_SYSTEM_FILES=true\n            ;;\n        \\?)\n            echo &quot;\u7121\u52b9\u306a\u30aa\u30d7\u30b7\u30e7\u30f3: -$OPTARG&quot;\n            echo &quot;\u4f7f\u7528\u65b9\u6cd5: $0 [-a] \/path\/to\/directory&quot;\n            echo &quot;  -a: .DS_Store \u3068 Thumbs.db \u3082\u524a\u9664\u3059\u308b&quot;\n            exit 1\n            ;;\n    esac\ndone\nshift $((OPTIND - 1))\n\nif [ -z &quot;$1&quot; ]; then\n    echo &quot;\u4f7f\u7528\u65b9\u6cd5: $0 [-a] \/path\/to\/directory&quot;\n    echo &quot;  -a: .DS_Store \u3068 Thumbs.db \u3082\u524a\u9664\u3059\u308b&quot;\n    exit 1\nfi\n\n# \u6307\u5b9a\u3055\u308c\u305f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u5b58\u5728\u3059\u308b\u304b\u78ba\u8a8d\nif [ ! -d &quot;$1&quot; ]; then\n    echo &quot;\u30a8\u30e9\u30fc: \u6307\u5b9a\u3055\u308c\u305f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u5b58\u5728\u3057\u307e\u305b\u3093: $1&quot;\n    exit 1\nfi\n\n# \u524a\u9664\u5bfe\u8c61\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u8868\u793a\necho &quot;\u4ee5\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u524a\u9664\u5bfe\u8c61\u3067\u3059:&quot;\necho &quot;================================&quot;\n\n# [conflicted]\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u7d22\nconflicted_count=0\necho &quot;\u25a0 [conflicted] \u30d5\u30a1\u30a4\u30eb:&quot;\nfind &quot;$1&quot; -type f -name &#39;*\\[conflicted*&#39; | while IFS= read -r file; do\n    echo &quot;  $file&quot;\ndone\nconflicted_count=$(find &quot;$1&quot; -type f -name &#39;*\\[conflicted*&#39; | wc -l)\n\n# \u30b7\u30b9\u30c6\u30e0\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u7d22\uff08\u30aa\u30d7\u30b7\u30e7\u30f3\u6307\u5b9a\u6642\uff09\nds_store_count=0\nthumbs_db_count=0\nif [ &quot;$DELETE_SYSTEM_FILES&quot; = true ]; then\n    echo &quot;&quot;\n    echo &quot;\u25a0 .DS_Store \u30d5\u30a1\u30a4\u30eb:&quot;\n    find &quot;$1&quot; -type f -name &#39;.DS_Store&#39; | while IFS= read -r file; do\n        echo &quot;  $file&quot;\n    done\n    ds_store_count=$(find &quot;$1&quot; -type f -name &#39;.DS_Store&#39; | wc -l)\n    \n    echo &quot;&quot;\n    echo &quot;\u25a0 Thumbs.db \u30d5\u30a1\u30a4\u30eb:&quot;\n    find &quot;$1&quot; -type f -name &#39;Thumbs.db&#39; | while IFS= read -r file; do\n        echo &quot;  $file&quot;\n    done\n    thumbs_db_count=$(find &quot;$1&quot; -type f -name &#39;Thumbs.db&#39; | wc -l)\nfi\n\n# \u5408\u8a08\u8868\u793a\necho &quot;================================&quot;\necho &quot;\u5408\u8a08:&quot;\necho &quot;  [conflicted] \u30d5\u30a1\u30a4\u30eb: ${conflicted_count} \u500b&quot;\nif [ &quot;$DELETE_SYSTEM_FILES&quot; = true ]; then\n    echo &quot;  .DS_Store: ${ds_store_count} \u500b&quot;\n    echo &quot;  Thumbs.db: ${thumbs_db_count} \u500b&quot;\n    total_count=$((conflicted_count + ds_store_count + thumbs_db_count))\n    echo &quot;  \u7dcf\u8a08: ${total_count} \u500b&quot;\nfi\necho &quot;&quot;\n\n# \u78ba\u8a8d\u3092\u6c42\u3081\u308b\nread -p &quot;\u3053\u308c\u3089\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f (y\/n): &quot; confirm\nif [ &quot;$confirm&quot; != &quot;y&quot; ]; then\n    echo &quot;\u51e6\u7406\u3092\u4e2d\u6b62\u3057\u307e\u3057\u305f&quot;\n    exit 0\nfi\n\n# \u518d\u78ba\u8a8d\nread -p &quot;\u672c\u5f53\u306b\u524a\u9664\u3057\u307e\u3059\u304b\uff1f\u3053\u306e\u64cd\u4f5c\u306f\u53d6\u308a\u6d88\u305b\u307e\u305b\u3093 (y\/n): &quot; confirm2\nif [ &quot;$confirm2&quot; != &quot;y&quot; ]; then\n    echo &quot;\u51e6\u7406\u3092\u4e2d\u6b62\u3057\u307e\u3057\u305f&quot;\n    exit 0\nfi\n\n# \u30d5\u30a1\u30a4\u30eb\u306e\u524a\u9664\u3092\u5b9f\u884c\necho &quot;&quot;\necho &quot;\u524a\u9664\u3092\u958b\u59cb\u3057\u307e\u3059...&quot;\necho &quot;================================&quot;\n\n# [conflicted]\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\nfind &quot;$1&quot; -type f -name &#39;*\\[conflicted*&#39; | while IFS= read -r file; do\n    rm &quot;$file&quot;\n    echo &quot;\u524a\u9664: $file&quot;\ndone\n\n# \u30b7\u30b9\u30c6\u30e0\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\uff08\u30aa\u30d7\u30b7\u30e7\u30f3\u6307\u5b9a\u6642\uff09\nif [ &quot;$DELETE_SYSTEM_FILES&quot; = true ]; then\n    find &quot;$1&quot; -type f -name &#39;.DS_Store&#39; | while IFS= read -r file; do\n        rm &quot;$file&quot;\n        echo &quot;\u524a\u9664: $file&quot;\n    done\n    \n    find &quot;$1&quot; -type f -name &#39;Thumbs.db&#39; | while IFS= read -r file; do\n        rm &quot;$file&quot;\n        echo &quot;\u524a\u9664: $file&quot;\n    done\nfi\n\necho &quot;================================&quot;\necho &quot;&quot;\necho &quot;\u51e6\u7406\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f&quot;\necho &quot;\u524a\u9664\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u6570:&quot;\necho &quot;  [conflicted] \u30d5\u30a1\u30a4\u30eb: ${conflicted_count} \u500b&quot;\nif [ &quot;$DELETE_SYSTEM_FILES&quot; = true ]; then\n    echo &quot;  .DS_Store: ${ds_store_count} \u500b&quot;\n    echo &quot;  Thumbs.db: ${thumbs_db_count} \u500b&quot;\n    total_count=$((conflicted_count + ds_store_count + thumbs_db_count))\n    echo &quot;  \u7dcf\u8a08: ${total_count} \u500b&quot;\nfi\n<\/code><\/pre>\n\n\n<h3 class=\"fz-ml\">\u4f7f\u7528\u624b\u9806<\/h3>\n\n<h4 class=\"fz-md\">\u30b9\u30c6\u30c3\u30d71\uff1a\u30b9\u30af\u30ea\u30d7\u30c8\u306e\u4fdd\u5b58<\/h4>\n<ol style=\"list-style-type:decimal;\">\n  <li>\u4e0a\u8a18\u306e\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u30c6\u30ad\u30b9\u30c8\u30a8\u30c7\u30a3\u30bf\u306b\u30b3\u30d4\u30fc<\/li>\n  <li><code>delete_conflicted.sh<\/code> \u3068\u3044\u3046\u540d\u524d\u3067\u4fdd\u5b58<\/li>\n  <li>\u5206\u304b\u308a\u3084\u3059\u3044\u5834\u6240\u306b\u4fdd\u5b58\uff08\u4f8b\uff1a<code>~\/ShellScripts\/delete_conflicted.sh<\/code>\uff09<\/li>\n<\/ol>\n\n<h4 class=\"fz-md\">\u30b9\u30c6\u30c3\u30d72\uff1a\u5b9f\u884c\u6a29\u9650\u306e\u4ed8\u4e0e<\/h4>\n<p>\u30bf\u30fc\u30df\u30ca\u30eb\u3067\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3059\uff1a<\/p>\n<pre><code class=\"language-bash\">chmod +x ~\/ShellScripts\/delete_conflicted.sh\n<\/code><\/pre>\n\n<h4 class=\"fz-md\">\u30b9\u30c6\u30c3\u30d73\uff1a\u30b9\u30af\u30ea\u30d7\u30c8\u306e\u5b9f\u884c<\/h4>\n<h5 class=\"fz-ss\">\u57fa\u672c\u7684\u306a\u4f7f\u3044\u65b9\uff08conflicted\u30d5\u30a1\u30a4\u30eb\u306e\u307f\u524a\u9664\uff09<\/h5>\n<pre><code class=\"language-bash\">~\/ShellScripts\/delete_conflicted.sh &quot;\/Users\/pCloud Drive\/MyProject&quot;\n<\/code><\/pre>\n<h5 class=\"fz-ss\">\u30b7\u30b9\u30c6\u30e0\u30d5\u30a1\u30a4\u30eb\u3082\u524a\u9664\uff08<code>-a<\/code>\u30aa\u30d7\u30b7\u30e7\u30f3\uff09<\/h5>\n<p><code>.DS_Store<\/code>\u3068<code>Thumbs.db<\/code>\u3082\u540c\u6642\u306b\u524a\u9664\u3057\u305f\u3044\u5834\u5408\uff1a<\/p>\n<pre><code class=\"language-bash\">~\/ShellScripts\/delete_conflicted.sh -a &quot;\/Users\/pCloud Drive\/MyProject&quot;\n<\/code><\/pre>\n\n<h4 class=\"fz-md\">\u5b9f\u884c\u4f8b\u3068\u51fa\u529b\u4f8b<\/h4>\n<pre><code class=\"language-bash\">~\/ShellScripts\/delete_conflicted.sh &quot;\/Users\/pCloud Drive\/MyProject&quot;\n<\/code><\/pre>\n\n<h4 class=\"fz-md\">\u51fa\u529b\u4f8b\uff1a<\/h4>\n<pre><code class=\"language-\">\u4ee5\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u524a\u9664\u5bfe\u8c61\u3067\u3059:\n================================\n\u25a0 [conflicted] \u30d5\u30a1\u30a4\u30eb:\n  \/Users\/pCloud Drive\/MyProject\/analytics [conflicted].php\n  \/Users\/pCloud Drive\/MyProject\/demo-pageband [conflicted 2].html\n================================\n\u5408\u8a08:\n  [conflicted] \u30d5\u30a1\u30a4\u30eb: 50 \u500b\n\n\u3053\u308c\u3089\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f (y\/n): y\n\u672c\u5f53\u306b\u524a\u9664\u3057\u307e\u3059\u304b\uff1f\u3053\u306e\u64cd\u4f5c\u306f\u53d6\u308a\u6d88\u305b\u307e\u305b\u3093 (y\/n): y\n\n\u524a\u9664\u3092\u958b\u59cb\u3057\u307e\u3059...\n================================\n\u524a\u9664: \/Users\/pCloud Drive\/MyProject\/analytics [conflicted].php\n\u524a\u9664: \/Users\/pCloud Drive\/MyProject\/demo-pageband [conflicted 2].html\n================================\n\n\u51e6\u7406\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\n\u524a\u9664\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u6570:\n  [conflicted] \u30d5\u30a1\u30a4\u30eb: 50 \u500b\n<\/code><\/pre>\n\n\n<h3 class=\"fz-ml\">\u30b9\u30af\u30ea\u30d7\u30c8\u306e\u4e3b\u306a\u6a5f\u80fd<\/h3>\n\n<h4 class=\"fz-md\">1. \u5b89\u5168\u6027\u306e\u78ba\u4fdd<\/h4>\n<ul style=\"list-style-type:bullet;\">\n  <li><b class=\"fw-600\">\u524a\u9664\u524d\u306e\u30d5\u30a1\u30a4\u30eb\u4e00\u89a7\u8868\u793a<\/b>: \u4f55\u304c\u524a\u9664\u3055\u308c\u308b\u304b\u4e8b\u524d\u306b\u78ba\u8a8d\u3067\u304d\u308b<\/li>\n  <li><b class=\"fw-600\">\u4e8c\u6bb5\u968e\u78ba\u8a8d<\/b>: \u8aa4\u64cd\u4f5c\u3092\u9632\u3050\u305f\u3081\u30012\u56de\u306e\u78ba\u8a8d\u30d7\u30ed\u30f3\u30d7\u30c8\u3092\u5b9f\u88c5<\/li>\n  <li><b class=\"fw-600\">\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5b58\u5728\u30c1\u30a7\u30c3\u30af<\/b>: \u6307\u5b9a\u30d1\u30b9\u304c\u5b58\u5728\u3059\u308b\u304b\u81ea\u52d5\u78ba\u8a8d<\/li>\n<\/ul>\n\n<h4 class=\"fz-md\">2. \u67d4\u8edf\u306a\u524a\u9664\u30aa\u30d7\u30b7\u30e7\u30f3<\/h4>\n<ul style=\"list-style-type:bullet;\">\n  <li><b class=\"fw-600\">\u57fa\u672c\u30e2\u30fc\u30c9<\/b>: <code>[conflicted]<\/code>\u30d5\u30a1\u30a4\u30eb\u306e\u307f\u3092\u524a\u9664<\/li>\n  <li><b class=\"fw-600\">\u62e1\u5f35\u30e2\u30fc\u30c9\uff08-a\uff09<\/b>: \u30b7\u30b9\u30c6\u30e0\u30d5\u30a1\u30a4\u30eb\u3082\u540c\u6642\u306b\u524a\u9664<ul style=\"list-style-type:bullet;\">\n      <li><code>.DS_Store<\/code>\uff08Mac\u306e\u96a0\u3057\u30d5\u30a1\u30a4\u30eb\uff09<\/li>\n      <li><code>Thumbs.db<\/code>\uff08Windows\u306e\u96a0\u3057\u30d5\u30a1\u30a4\u30eb\uff09<\/li>\n    <\/ul>\n  <\/li>\n<\/ul>\n\n<h4 class=\"fz-md\">3. \u8a73\u7d30\u306a\u30ec\u30dd\u30fc\u30c8<\/h4>\n<ul style=\"list-style-type:bullet;\">\n  <li>\u30d5\u30a1\u30a4\u30eb\u7a2e\u5225\u3054\u3068\u306e\u4ef6\u6570\u8868\u793a<\/li>\n  <li>\u524a\u9664\u51e6\u7406\u306e\u9032\u6357\u3092\u30ea\u30a2\u30eb\u30bf\u30a4\u30e0\u8868\u793a<\/li>\n  <li>\u51e6\u7406\u5b8c\u4e86\u5f8c\u306e\u96c6\u8a08\u30ec\u30dd\u30fc\u30c8<\/li>\n<\/ul>\n\n\n<h3 class=\"fz-ml\">\u30c8\u30e9\u30d6\u30eb\u30b7\u30e5\u30fc\u30c6\u30a3\u30f3\u30b0<\/h3>\n\n<h4 class=\"fz-md\">\u30a8\u30e9\u30fc1\uff1a\u300cPermission denied\u300d<\/h4>\n<p><b class=\"fw-600\">\u539f\u56e0\uff1a<\/b> \u30d5\u30a1\u30a4\u30eb\u3084\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3078\u306e\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u304c\u306a\u3044<\/p>\n<p><b class=\"fw-600\">\u89e3\u6c7a\u65b9\u6cd5\uff1a<\/b><\/p>\n<pre><code class=\"language-bash\"># \u7ba1\u7406\u8005\u6a29\u9650\u3067\u5b9f\u884c\uff08\u614e\u91cd\u306b\uff09\nsudo ~\/ShellScripts\/delete_conflicted.sh &quot;\/path\/to\/directory&quot;\n<\/code><\/pre>\n\n<h4 class=\"fz-md\">\u30a8\u30e9\u30fc2\uff1a\u300cNo such file or directory\u300d<\/h4>\n<p><b class=\"fw-600\">\u539f\u56e0\uff1a<\/b> \u30d1\u30b9\u306e\u6307\u5b9a\u304c\u9593\u9055\u3063\u3066\u3044\u308b<\/p>\n<p><b class=\"fw-600\">\u89e3\u6c7a\u65b9\u6cd5\uff1a<\/b><\/p>\n<ol style=\"list-style-type:decimal;\">\n  <li>\u30d1\u30b9\u3092\u30c0\u30d6\u30eb\u30af\u30a9\u30fc\u30c8\u3067\u56f2\u3080<\/li>\n  <li><code>ls<\/code>\u30b3\u30de\u30f3\u30c9\u3067\u30d1\u30b9\u3092\u78ba\u8a8d<\/li>\n<\/ol>\n<pre><code class=\"language-bash\">ls &quot;\/Volumes\/CT1000P3\/pCloud(CT1000P3)&quot;\n<\/code><\/pre>\n\n<h4 class=\"fz-md\">\u30a8\u30e9\u30fc3\uff1a\u3059\u3079\u3066\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u5bfe\u8c61\u306b\u306a\u308b<\/h4>\n<p><b class=\"fw-600\">\u539f\u56e0\uff1a<\/b> \u89d2\u62ec\u5f27\u306e\u30a8\u30b9\u30b1\u30fc\u30d7\u5fd8\u308c<\/p>\n<p><b class=\"fw-600\">\u9593\u9055\u3044\uff1a<\/b><\/p>\n<pre><code class=\"language-bash\">find &quot;\/path&quot; -type f -name &#39;*[conflicted]*&#39;  # NG\n<\/code><\/pre>\n<p><b class=\"fw-600\">\u6b63\u3057\u3044\uff1a<\/b><\/p>\n<pre><code class=\"language-bash\">find &quot;\/path&quot; -type f -name &#39;*\\[conflicted*&#39;  # OK\n<\/code><\/pre>\n\n<h4 class=\"fz-md\">\u30a8\u30e9\u30fc4\uff1a\u30b9\u30af\u30ea\u30d7\u30c8\u304c\u5b9f\u884c\u3067\u304d\u306a\u3044<\/h4>\n<p><b class=\"fw-600\">\u539f\u56e0\uff1a<\/b> \u5b9f\u884c\u6a29\u9650\u304c\u306a\u3044<\/p>\n<p><b class=\"fw-600\">\u89e3\u6c7a\u65b9\u6cd5\uff1a<\/b><\/p>\n<pre><code class=\"language-bash\">chmod +x ~\/ShellScripts\/delete_conflicted.sh\n<\/code><\/pre>\n\n\n<h3 class=\"fz-ml\">\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u65b9\u6cd5<\/h3>\n\n<h4 class=\"fz-md\">\u7570\u306a\u308b\u30d1\u30bf\u30fc\u30f3\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u305f\u3044\u5834\u5408<\/h4>\n<p>\u30b9\u30af\u30ea\u30d7\u30c8\u5185\u306e\u4ee5\u4e0b\u306e\u90e8\u5206\u3092\u5909\u66f4\u3057\u307e\u3059\uff1a<\/p>\n<pre><code class=\"language-bash\"># \u4f8b\uff1a\u300ccopy\u300d\u3068\u3044\u3046\u6587\u5b57\u5217\u3092\u542b\u3080\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\nfind &quot;$1&quot; -type f -name &#39;*copy*&#39;\n<\/code><\/pre>\n\n<h4 class=\"fz-md\">\u30b4\u30df\u7bb1\u306b\u79fb\u52d5\u3059\u308b\u65b9\u5f0f\u306b\u5909\u66f4<\/h4>\n<p>\u5b8c\u5168\u524a\u9664\u3067\u306f\u306a\u304f\u3001\u30b4\u30df\u7bb1\u306b\u79fb\u52d5\u3057\u305f\u3044\u5834\u5408\uff1a<\/p>\n<pre><code class=\"language-bash\"># rm\u306e\u4ee3\u308f\u308a\u306bmv\u3092\u4f7f\u7528\nmv &quot;$file&quot; ~\/.Trash\/\n<\/code><\/pre>\n\n\n<h3 class=\"fz-ml\">Mac\u7248\u3067\u306e\u6ce8\u610f\u70b9 \u26a0\ufe0f<\/h3>\n<ol style=\"list-style-type:decimal;\">\n  <li><b class=\"fw-600\">\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u306e\u53d6\u5f97<\/b>: \u524a\u9664\u306f\u53d6\u308a\u6d88\u305b\u306a\u3044\u305f\u3081\u3001\u5fc5\u305a\u4e8b\u524d\u306b\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3092\u53d6\u308b<\/li>\n  <li><b class=\"fw-600\">\u30c6\u30b9\u30c8\u74b0\u5883\u3067\u78ba\u8a8d<\/b>: \u5c0f\u3055\u306a\u30c6\u30b9\u30c8\u30d5\u30a9\u30eb\u30c0\u3067\u52d5\u4f5c\u78ba\u8a8d\u3057\u3066\u304b\u3089\u672c\u756a\u5b9f\u884c<\/li>\n  <li><b class=\"fw-600\">\u540c\u671f\u306e\u505c\u6b62<\/b>: \u30af\u30e9\u30a6\u30c9\u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u540c\u671f\u3092\u4e00\u6642\u505c\u6b62\u3057\u3066\u304b\u3089\u5b9f\u884c<\/li>\n  <li><b class=\"fw-600\">\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u78ba\u8a8d<\/b>: \u524a\u9664\u524d\u306b\u91cd\u8981\u306a\u30d5\u30a1\u30a4\u30eb\u3067\u306a\u3044\u304b\u78ba\u8a8d<\/li>\n<\/ol>\n\n<h4 class=\"fz-md\">\u63a8\u5968\u624b\u9806<\/h4>\n<ol style=\"list-style-type:decimal;\">\n  <li>\u30af\u30e9\u30a6\u30c9\u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u540c\u671f\u3092\u505c\u6b62<\/li>\n  <li><code>find<\/code>\u30b3\u30de\u30f3\u30c9\u3067\u5bfe\u8c61\u30d5\u30a1\u30a4\u30eb\u3092\u78ba\u8a8d<\/li>\n  <li>\u91cd\u8981\u306a\u30d5\u30a1\u30a4\u30eb\u304c\u542b\u307e\u308c\u3066\u3044\u306a\u3044\u304b\u76ee\u8996\u78ba\u8a8d<\/li>\n  <li>\u30c6\u30b9\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u52d5\u4f5c\u78ba\u8a8d<\/li>\n  <li>\u672c\u756a\u74b0\u5883\u3067\u5b9f\u884c<\/li>\n  <li>\u540c\u671f\u3092\u518d\u958b<\/li>\n<\/ol>\n\n<hr class=\"separator mx-auto mt-3r\" \/>\n\n<h3 class=\"fz-ml\">\u3088\u304f\u3042\u308b\u8cea\u554f\uff08Mac\u7248\uff09<\/h3>\n\n<h4 class=\"fz-md\">Q1: \u524a\u9664\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306f\u5fa9\u5143\u3067\u304d\u307e\u3059\u304b\uff1f<\/h4>\n<p>A: <code>rm<\/code>\u30b3\u30de\u30f3\u30c9\u306b\u3088\u308b\u524a\u9664\u306f\u5fa9\u5143\u3067\u304d\u307e\u305b\u3093\u3002\u30b4\u30df\u7bb1\u306b\u79fb\u52d5\u3059\u308b\u65b9\u5f0f\u306b\u5909\u66f4\u3059\u308b\u304b\u3001Time Machine\u306a\u3069\u306e\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u304b\u3089\u5fa9\u5143\u3057\u3066\u304f\u3060\u3055\u3044\u3002<\/p>\n\n<h4 class=\"fz-md\">Q2: \u30b5\u30d6\u30d5\u30a9\u30eb\u30c0\u306e\u6df1\u3055\u306b\u5236\u9650\u306f\u3042\u308a\u307e\u3059\u304b\uff1f<\/h4>\n<p>A: <code>find<\/code>\u30b3\u30de\u30f3\u30c9\u306f\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u7121\u5236\u9650\u306b\u518d\u5e30\u691c\u7d22\u3059\u308b\u305f\u3081\u3001\u3069\u308c\u3060\u3051\u6df1\u3044\u968e\u5c64\u3067\u3082\u5bfe\u5fdc\u53ef\u80fd\u3067\u3059\u3002<\/p>\n\n<h4 class=\"fz-md\">Q3: \u5916\u4ed8\u3051HDD\u3084\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30c9\u30e9\u30a4\u30d6\u3067\u3082\u4f7f\u3048\u307e\u3059\u304b\uff1f<\/h4>\n<p>A: \u306f\u3044\u3001\u30de\u30a6\u30f3\u30c8\u3055\u308c\u3066\u3044\u308b\u3059\u3079\u3066\u306e\u30c9\u30e9\u30a4\u30d6\u3067\u4f7f\u7528\u53ef\u80fd\u3067\u3059\u3002\u305f\u3060\u3057\u3001\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30c9\u30e9\u30a4\u30d6\u306e\u5834\u5408\u306f\u51e6\u7406\u306b\u6642\u9593\u304c\u304b\u304b\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n\n<h4 class=\"fz-md\">Q4: \u7279\u5b9a\u306e\u30b5\u30d6\u30d5\u30a9\u30eb\u30c0\u3060\u3051\u3092\u9664\u5916\u3067\u304d\u307e\u3059\u304b\uff1f<\/h4>\n<p>A: <code>find<\/code>\u30b3\u30de\u30f3\u30c9\u306b<code>-prune<\/code>\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3059\u308b\u3053\u3068\u3067\u9664\u5916\u53ef\u80fd\u3067\u3059\uff1a<\/p>\n<pre><code class=\"language-bash\">find &quot;$1&quot; -type d -name &#39;node_modules&#39; -prune -o -type f -name &#39;*\\[conflicted*&#39; -print\n<\/code><\/pre>\n\n\n\n\n<hr class=\"separator mx-auto mt-3r\" \/>\n\n<h2 class=\"fz-xl\">Windows\u74b0\u5883\u3067\u306e\u5b9f\u884c\u65b9\u6cd5<\/h2>\n\n<p>Windows\u3067\u306f**\u30d0\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\uff08.bat\uff09**\u3092\u4f7f\u7528\u3059\u308b\u306e\u304c\u6700\u3082\u30b7\u30f3\u30d7\u30eb\u3067\u78ba\u5b9f\u3067\u3059\u3002\u30b3\u30de\u30f3\u30c9\u30d7\u30ed\u30f3\u30d7\u30c8\u307e\u305f\u306fNode.js command prompt\u3067\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002<\/p>\n\n<h3 class=\"fz-ml\">\u30b3\u30de\u30f3\u30c9\u30d7\u30ed\u30f3\u30d7\u30c8\u7528\u30d0\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\uff08delete_conflicted.bat\uff09<\/h3>\n<p>\u4ee5\u4e0b\u306e\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u30e1\u30e2\u5e33\u306b\u30b3\u30d4\u30fc\u3057\u3066\u3001<code>delete_conflicted.bat<\/code>\u3068\u3057\u3066\u4fdd\u5b58\u3057\u3066\u304f\u3060\u3055\u3044\u3002<\/p>\n<pre><code class=\"language-batch\">@echo off\nchcp 65001 &gt; nul\nsetlocal enabledelayedexpansion\n\nrem \u5f15\u6570\u30c1\u30a7\u30c3\u30af\nif &quot;%~1&quot;==&quot;&quot; (\n    echo \u4f7f\u7528\u65b9\u6cd5: %~nx0 &quot;\u5bfe\u8c61\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30b9&quot;\n    pause\n    exit \/b 1\n)\n\nif not exist &quot;%~1&quot; (\n    echo \u30a8\u30e9\u30fc: \u30d5\u30a9\u30eb\u30c0\u304c\u5b58\u5728\u3057\u307e\u305b\u3093: %~1\n    pause\n    exit \/b 1\n)\n\necho [conflicted]\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u7d22\u4e2d...\necho.\n\nset COUNT=0\nfor \/r &quot;%~1&quot; %%f in (*[conflicted]*) do (\n    echo   %%f\n    set \/a COUNT+=1\n)\n\necho.\necho --------------------------------\necho \u5408\u8a08: !COUNT! \u500b\necho.\n\nif !COUNT!==0 (\n    echo [conflicted]\u30d5\u30a1\u30a4\u30eb\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\n    pause\n    exit \/b 0\n)\n\nset \/p CONFIRM=&quot;\u524a\u9664\u3057\u307e\u3059\u304b\uff1f (y\/n): &quot;\nif \/i not &quot;!CONFIRM!&quot;==&quot;y&quot; (\n    echo \u30ad\u30e3\u30f3\u30bb\u30eb\u3057\u307e\u3057\u305f\n    pause\n    exit \/b 0\n)\n\necho.\necho \u524a\u9664\u4e2d...\nset DELETED=0\nfor \/r &quot;%~1&quot; %%f in (*[conflicted]*) do (\n    del &quot;%%f&quot; 2&gt;nul\n    if !errorlevel!==0 (\n        echo \u524a\u9664: %%f\n        set \/a DELETED+=1\n    )\n)\n\necho.\necho --------------------------------\necho \u5b8c\u4e86: !DELETED! \u500b\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u307e\u3057\u305f\npause\n<\/code><\/pre>\n\n<h3 class=\"fz-ml\">\u4f7f\u7528\u624b\u9806<\/h3>\n<h4 class=\"fz-md\">\u30b9\u30c6\u30c3\u30d71\uff1a\u30b9\u30af\u30ea\u30d7\u30c8\u306e\u4fdd\u5b58<\/h4>\n<ol style=\"list-style-type:decimal;\">\n    <li>\u4e0a\u8a18\u306e\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u30e1\u30e2\u5e33\u306b\u30b3\u30d4\u30fc<\/li>\n    <li><code>delete_conflicted.bat<\/code> \u3068\u3044\u3046\u540d\u524d\u3067\u4fdd\u5b58<\/li>\n    <li>\u5206\u304b\u308a\u3084\u3059\u3044\u5834\u6240\u306b\u4fdd\u5b58\uff08\u4f8b\uff1a<code>c:\\Users\\hsara\\Dropbox\\ShellScripts\\delete_conflicted\\delete_conflicted.bat<\/code>\uff09<\/li>\n<\/ol>\n<h4 class=\"fz-md\">\u30b9\u30c6\u30c3\u30d72\uff1a\u30b3\u30de\u30f3\u30c9\u30d7\u30ed\u30f3\u30d7\u30c8\u3092\u958b\u304f<\/h4>\n<p>\u4ee5\u4e0b\u306e\u3044\u305a\u308c\u304b\u306e\u65b9\u6cd5\u3067\u958b\u3051\u307e\u3059\uff1a<\/p>\n<p><b class=\"fw-600\">\u65b9\u6cd5A\uff1a\u30b3\u30de\u30f3\u30c9\u30d7\u30ed\u30f3\u30d7\u30c8<\/b><\/p>\n<ul style=\"list-style-type:bullet;\">\n    <li>Windows\u30ad\u30fc + R \u2192 <code>cmd<\/code> \u3068\u5165\u529b\u3057\u3066Enter<\/li>\n<\/ul>\n<p><b class=\"fw-600\">\u65b9\u6cd5B\uff1aNode.js command prompt<\/b><\/p>\n<ul style=\"list-style-type:bullet;\">\n    <li>\u30b9\u30bf\u30fc\u30c8\u30e1\u30cb\u30e5\u30fc\u304b\u3089\u300cNode.js command prompt\u300d\u3092\u8d77\u52d5<\/li>\n<\/ul>\n<p><b class=\"fw-600\">\u65b9\u6cd5C\uff1aWindows Terminal<\/b><\/p>\n<ul style=\"list-style-type:bullet;\">\n    <li>\u30b9\u30bf\u30fc\u30c8\u30e1\u30cb\u30e5\u30fc\u304b\u3089\u300cWindows Terminal\u300d\u3092\u8d77\u52d5<\/li>\n    <li>\u30bf\u30d6\u3067\u300c\u30b3\u30de\u30f3\u30c9\u30d7\u30ed\u30f3\u30d7\u30c8\u300d\u3092\u9078\u629e<\/li>\n<\/ul>\n<h4 class=\"fz-md\">\u30b9\u30c6\u30c3\u30d73\uff1a\u30d0\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\u306e\u5b9f\u884c<\/h4>\n<pre><code class=\"language-cmd\">cd &quot;c:\\Users\\hsara\\Dropbox\\ShellScripts\\delete_conflicted&quot;\ndelete_conflicted.bat &quot;z:\\pCloud Folder\\Github&quot;\n<\/code><\/pre>\n\n<h3 class=\"fz-ml\">\u5b9f\u884c\u4f8b<\/h3>\n<pre><code class=\"language-cmd\">c:\\Users\\hsara\\Dropbox\\ShellScripts\\delete_conflicted&gt;delete_conflicted.bat &quot;z:\\pCloud Folder\\Github&quot;\n[conflicted]\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u7d22\u4e2d...\n\n  z:\\pCloud Folder\\Github\\MyProject\\ [conflicted].gitignore\n  z:\\pCloud Folder\\Github\\MyProject\\package [conflicted].json\n  z:\\pCloud Folder\\Github\\MyProject\\.git\\COMMIT_EDITMSG [conflicted]\n  z:\\pCloud Folder\\Github\\MyProject\\docs\\document [conflicted].md\n\n--------------------------------\n\u5408\u8a08: 19 \u500b\n\n\u524a\u9664\u3057\u307e\u3059\u304b\uff1f (y\/n): y\n\n\u524a\u9664\u4e2d...\n\u524a\u9664: z:\\pCloud Folder\\Github\\MyProject\\ [conflicted].gitignore\n\u524a\u9664: z:\\pCloud Folder\\Github\\MyProject\\package [conflicted].json\n\u524a\u9664: z:\\pCloud Folder\\Github\\MyProject\\.git\\COMMIT_EDITMSG [conflicted]\n\u524a\u9664: z:\\pCloud Folder\\Github\\MyProject\\docs\\document [conflicted].md\n\n--------------------------------\n\u5b8c\u4e86: 19 \u500b\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u307e\u3057\u305f\nPress any key to continue . . .\n<\/code><\/pre>\n\n<hr class=\"separator mx-auto mt-3r\" \/>\n\n<h3 class=\"fz-ml\">\u30d0\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\u306e\u4e3b\u306a\u6a5f\u80fd<\/h3>\n\n<h4 class=\"fz-md\">>1. \u5b89\u5168\u6027\u306e\u78ba\u4fdd<\/h4>\n<ul style=\"list-style-type:bullet;\">\n    <li><b class=\"fw-600\">\u524a\u9664\u524d\u306e\u30d5\u30a1\u30a4\u30eb\u4e00\u89a7\u8868\u793a<\/b>: \u4f55\u304c\u524a\u9664\u3055\u308c\u308b\u304b\u4e8b\u524d\u306b\u78ba\u8a8d\u3067\u304d\u308b<\/li>\n    <li><b class=\"fw-600\">\u78ba\u8a8d\u30d7\u30ed\u30f3\u30d7\u30c8<\/b>: \u8aa4\u64cd\u4f5c\u3092\u9632\u3050\u305f\u3081\u3001\u78ba\u8a8d\u3092\u6c42\u3081\u308b<\/li>\n    <li><b class=\"fw-600\">\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5b58\u5728\u30c1\u30a7\u30c3\u30af<\/b>: \u6307\u5b9a\u30d1\u30b9\u304c\u5b58\u5728\u3059\u308b\u304b\u81ea\u52d5\u78ba\u8a8d<\/li>\n<\/ul>\n\n<h4 class=\"fz-md\">>2. \u8a73\u7d30\u306a\u30ec\u30dd\u30fc\u30c8<\/h4>\n<ul style=\"list-style-type:bullet;\">\n    <li>\u30d5\u30a1\u30a4\u30eb\u6570\u306e\u8868\u793a<\/li>\n    <li>\u524a\u9664\u51e6\u7406\u306e\u9032\u6357\u3092\u30ea\u30a2\u30eb\u30bf\u30a4\u30e0\u8868\u793a<\/li>\n    <li>\u51e6\u7406\u5b8c\u4e86\u5f8c\u306e\u96c6\u8a08\u30ec\u30dd\u30fc\u30c8<\/li>\n<\/ul>\n\n<h4 class=\"fz-md\">>3. \u4f7f\u3044\u3084\u3059\u3044\u5b9f\u884c\u65b9\u6cd5<\/h4>\n<ul style=\"list-style-type:bullet;\">\n    <li>\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u304b\u3089\u5f15\u6570\u3092\u6e21\u3057\u3066\u5b9f\u884c<\/li>\n    <li>\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30c9\u30e9\u30a4\u30d6\uff08Z:\u306a\u3069\uff09\u306b\u3082\u5bfe\u5fdc<\/li>\n<\/ul>\n\n<hr class=\"separator mx-auto mt-3r\" \/>\n\n<h3 class=\"fz-ml\">Windows\u7248\u3067\u306e\u6ce8\u610f\u70b9 \u26a0\ufe0f<\/h3>\n\n<h4 class=\"fz-md\">>\u30d1\u30b9\u306e\u6307\u5b9a\u65b9\u6cd5<\/h4>\n<p>Windows\u3067\u306f\u30d0\u30c3\u30af\u30b9\u30e9\u30c3\u30b7\u30e5 <code>\\<\/code> \u3092\u4f7f\u7528\u3057\u307e\u3059\uff1a<\/p>\n<pre><code class=\"language-cmd\">delete_conflicted.bat &quot;c:\\Users\\hsara\\Documents\\MyFolder&quot;\ndelete_conflicted.bat &quot;z:\\pCloud Folder\\Github&quot;\n<\/code><\/pre>\n<p><b class=\"fw-600\">\u91cd\u8981\uff1a<\/b><\/p>\n<ul style=\"list-style-type:bullet;\">\n    <li>\u30b9\u30da\u30fc\u30b9\u3092\u542b\u3080\u30d1\u30b9\u306f\u5fc5\u305a\u30c0\u30d6\u30eb\u30af\u30a9\u30fc\u30c8 <code>&quot;<\/code> \u3067\u56f2\u3080<\/li>\n    <li>\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30c9\u30e9\u30a4\u30d6\uff08Z:\u3001Y:\u306a\u3069\uff09\u3082\u4f7f\u7528\u53ef\u80fd<\/li>\n<\/ul>\n\n<h4 class=\"fz-md\">>\u30a8\u30e9\u30fc\uff1a\u300c\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u300d<\/h4>\n<p><b class=\"fw-600\">\u539f\u56e0\uff1a<\/b> \u30d0\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\u306e\u30d1\u30b9\u304c\u9593\u9055\u3063\u3066\u3044\u308b<\/p>\n<p><b class=\"fw-600\">\u89e3\u6c7a\u65b9\u6cd5\uff1a<\/b><\/p>\n<pre><code class=\"language-cmd\"># \u30d0\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308b\u30d5\u30a9\u30eb\u30c0\u306b\u79fb\u52d5\ncd &quot;c:\\Users\\hsara\\Dropbox\\ShellScripts\\delete_conflicted&quot;\n\n# \u305d\u306e\u5f8c\u5b9f\u884c\ndelete_conflicted.bat &quot;\u5bfe\u8c61\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30b9&quot;\n<\/code><\/pre>\n\n<h4 class=\"fz-md\">>\u30a8\u30e9\u30fc\uff1a\u300c\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u307e\u3057\u305f\u300d<\/h4>\n<p><b class=\"fw-600\">\u539f\u56e0\uff1a<\/b> \u30d5\u30a1\u30a4\u30eb\u304c\u4f7f\u7528\u4e2d\u3001\u307e\u305f\u306f\u6a29\u9650\u304c\u306a\u3044<\/p>\n<p><b class=\"fw-600\">\u89e3\u6c7a\u65b9\u6cd5\uff1a<\/b><\/p>\n<ol style=\"list-style-type:decimal;\">\n    <li>\u30af\u30e9\u30a6\u30c9\u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u540c\u671f\u3092\u4e00\u6642\u505c\u6b62<\/li>\n    <li>\u5bfe\u8c61\u30d5\u30a1\u30a4\u30eb\u3092\u958b\u3044\u3066\u3044\u308b\u30a2\u30d7\u30ea\u3092\u9589\u3058\u308b<\/li>\n    <li>\u7ba1\u7406\u8005\u6a29\u9650\u3067\u30b3\u30de\u30f3\u30c9\u30d7\u30ed\u30f3\u30d7\u30c8\u3092\u8d77\u52d5\uff08\u53f3\u30af\u30ea\u30c3\u30af \u2192 \u300c\u7ba1\u7406\u8005\u3068\u3057\u3066\u5b9f\u884c\u300d\uff09<\/li>\n<\/ol>\n\n\n<hr class=\"separator mx-auto mt-3r\" \/>\n<h3 class=\"fz-ml\">\u3088\u304f\u3042\u308b\u8cea\u554f\uff08Windows\u7248\uff09<\/h3>\n\n<\/h4>Q1: \u30c0\u30d6\u30eb\u30af\u30ea\u30c3\u30af\u3067\u5b9f\u884c\u3067\u304d\u307e\u3059\u304b\uff1f<\/h4>\n<p>A: \u306f\u3044\u3001\u53ef\u80fd\u3067\u3059\u3002\u30d0\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\u3092\u30c0\u30d6\u30eb\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u3001\u5bfe\u8a71\u7684\u306b\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002\u305f\u3060\u3057\u3001\u30d1\u30b9\u3092\u6bce\u56de\u5165\u529b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u305f\u3081\u3001\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u304b\u3089\u5f15\u6570\u3092\u6e21\u3059\u65b9\u304c\u4fbf\u5229\u3067\u3059\u3002<\/p>\n\n<\/h4>Q2: OneDrive\u3084Dropbox\u3067\u3082\u4f7f\u3048\u307e\u3059\u304b\uff1f<\/h4>\n<p>A: \u306f\u3044\u3001\u3059\u3079\u3066\u306e\u30af\u30e9\u30a6\u30c9\u30b9\u30c8\u30ec\u30fc\u30b8\u3067\u4f7f\u7528\u53ef\u80fd\u3067\u3059\u3002\u305f\u3060\u3057\u3001\u524a\u9664\u524d\u306b\u540c\u671f\u3092\u4e00\u6642\u505c\u6b62\u3059\u308b\u3053\u3068\u3092\u304a\u3059\u3059\u3081\u3057\u307e\u3059\u3002<\/p>\n\n<\/h4>Q3: Windows Terminal\u3068\u306f\u4f55\u3067\u3059\u304b\uff1f<\/h4>\n<p>A: Microsoft\u306e\u516c\u5f0f\u30bf\u30fc\u30df\u30ca\u30eb\u30a2\u30d7\u30ea\u3067\u3001\u30bf\u30d6\u6a5f\u80fd\u3084\u898b\u3084\u3059\u3044\u8868\u793a\u304c\u7279\u5fb4\u3067\u3059\u3002Microsoft Store\u304b\u3089\u7121\u6599\u3067\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3067\u304d\u3001\u30b3\u30de\u30f3\u30c9\u30d7\u30ed\u30f3\u30d7\u30c8\u3001PowerShell\u3001Git Bash\u306a\u3069\u3092\u7d71\u5408\u3057\u3066\u4f7f\u3048\u307e\u3059\u3002Windows 11\u3067\u306f\u6a19\u6e96\u642d\u8f09\u3055\u308c\u3066\u3044\u307e\u3059\u3002<\/p>\n\n\n\n<hr class=\"separator mx-auto mt-3r\" \/>\n\n<h2 class=\"fz-xl\">\u307e\u3068\u3081<\/h2>\n<p>\u3053\u306e\u8a18\u4e8b\u3067\u306f\u3001Mac\u306e\u30bf\u30fc\u30df\u30ca\u30eb \/ Windows \u30b3\u30de\u30f3\u30c9\u30d7\u30ed\u30f3\u30d7\u30c8\u3092\u4f7f\u3063\u3066<code>[conflicted]<\/code>\u30d5\u30a1\u30a4\u30eb\u3092\u5b89\u5168\u304b\u3064\u52b9\u7387\u7684\u306b\u4e00\u62ec\u524a\u9664\u3059\u308b\u65b9\u6cd5\u3092\u7d39\u4ecb\u3057\u307e\u3057\u305f\u3002<\/p>\n\n<h4 class=\"fz-md\">\u30dd\u30a4\u30f3\u30c8\u306e\u304a\u3055\u3089\u3044<\/h4>\n<ul style=\"list-style-type:bullet;\">\n  <li><code>find<\/code>\u30b3\u30de\u30f3\u30c9\u3067\u89d2\u62ec\u5f27\u3092\u30a8\u30b9\u30b1\u30fc\u30d7\uff08<code>\\[<\/code>\uff09<\/li>\n  <li>\u524a\u9664\u524d\u306b\u5fc5\u305a\u5bfe\u8c61\u30d5\u30a1\u30a4\u30eb\u3092\u78ba\u8a8d<\/li>\n  <li>\u4e8c\u6bb5\u968e\u78ba\u8a8d\u3067\u8aa4\u524a\u9664\u3092\u9632\u6b62<\/li>\n  <li><code>-a<\/code>\u30aa\u30d7\u30b7\u30e7\u30f3\u3067<code>.DS_Store<\/code>\u3082\u540c\u6642\u524a\u9664\u53ef\u80fd<\/li>\n  <li>\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3092\u53d6\u3063\u3066\u304b\u3089\u5b9f\u884c<\/li>\n<\/ul>\n<p>\u30af\u30e9\u30a6\u30c9\u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u65e5\u5e38\u7684\u306b\u4f7f\u7528\u3057\u3066\u3044\u308b\u65b9\u306b\u3068\u3063\u3066\u3001\u3053\u306e\u65b9\u6cd5\u306f\u5927\u91cf\u306e\u7af6\u5408\u30d5\u30a1\u30a4\u30eb\u3092\u52b9\u7387\u7684\u306b\u7ba1\u7406\u3059\u308b\u306e\u306b\u5f79\u7acb\u3061\u307e\u3059\u3002\u7279\u306b\u3001\u958b\u767a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3084\u30af\u30ea\u30a8\u30a4\u30c6\u30a3\u30d6\u30ef\u30fc\u30af\u3067\u591a\u6570\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u6271\u3046\u5834\u5408\u3001\u5b9a\u671f\u7684\u306a\u30e1\u30f3\u30c6\u30ca\u30f3\u30b9\u3068\u3057\u3066\u6d3b\u7528\u3067\u304d\u307e\u3059\u3002<\/p>\n<p>\u30b9\u30af\u30ea\u30d7\u30c8\u306f\u4e00\u5ea6\u8a2d\u5b9a\u3059\u308c\u3070\u7e70\u308a\u8fd4\u3057\u4f7f\u7528\u3067\u304d\u308b\u305f\u3081\u3001\u305c\u3072\u81ea\u5206\u306e\u74b0\u5883\u306b\u5408\u308f\u305b\u3066\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3057\u3066\u3054\u6d3b\u7528\u304f\u3060\u3055\u3044\u3002<\/p>\n\n<hr class=\"separator mx-auto mt-3r\" \/>\n\n<h2 class=\"fz-xl\">\u95a2\u9023\u8a18\u4e8b<\/h2>\n<ul style=\"list-style-type:bullet;\">\n  <li><a href=\"https:\/\/code-plus.jp\/gp\/remove-conflicted-7988\/\" class=\"link\">Mac\u306e\u30bf\u30fc\u30df\u30ca\u30eb\u3092\u4f7f\u3063\u3066\u3001\u30b5\u30d6\u30d5\u30a9\u30eb\u30c0\u5185\u3092\u542b\u3080\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u4e00\u62ec\u30ea\u30cd\u30fc\u30e0\u3059\u308b\u65b9\u6cd5<\/a><\/li>\n  <li>Mac\u30bf\u30fc\u30df\u30ca\u30eb\u306e\u57fa\u672c\u30b3\u30de\u30f3\u30c9\u96c6<\/li>\n<\/ul>","protected":false},"excerpt":{"rendered":"Mac\u306e\u30bf\u30fc\u30df\u30ca\u30eb\u3067pCloud\u3084Dropbox\u306e[conflicted]\u30d5\u30a1\u30a4\u30eb\u3092\u5b89\u5168\u306b\u4e00\u62ec\u524a\u9664\u3059\u308b\u65b9\u6cd5\u3092\u89e3\u8aac\u3002\u30b5\u30d6\u30d5\u30a9\u30eb\u30c0\u5bfe\u5fdc\u306e\u30b7\u30a7\u30eb\u30b9\u30af\u30ea\u30d7\u30c8\u3067.DS_Store\u3084Thumbs.db\u3082\u524a\u9664\u53ef\u80fd\u3002\u524a\u9664\u524d\u78ba\u8a8d\u6a5f\u80fd\u4ed8\u304d\u3067\u5b89\u5168\u306b\u51e6\u7406\u3059\u308b\u30b7\u30a7\u30eb\u30b9\u30af\u30ea\u30d7\u30c8\u306e\u4f7f\u3044\u65b9\u3092\u8a73\u3057\u304f\u89e3\u8aac\u3057\u307e\u3059\u3002","protected":false},"author":1,"featured_media":9496,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[14],"tags":[438,439,440,441,442,443,303,301,173],"group":[],"pg":[],"class_list":["post-9494","post","type-post","status-publish","format-standard","has-post-thumbnail","category-develop-env","tag-438","tag-conflicted","tag-440","tag-441","tag-pcloud","tag-bash","tag-303","tag-301","tag-mac"],"acf":[],"_links":{"self":[{"href":"https:\/\/code-plus.jp\/gp\/wp-json\/wp\/v2\/posts\/9494","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/code-plus.jp\/gp\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/code-plus.jp\/gp\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/code-plus.jp\/gp\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/code-plus.jp\/gp\/wp-json\/wp\/v2\/comments?post=9494"}],"version-history":[{"count":0,"href":"https:\/\/code-plus.jp\/gp\/wp-json\/wp\/v2\/posts\/9494\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/code-plus.jp\/gp\/wp-json\/wp\/v2\/media\/9496"}],"wp:attachment":[{"href":"https:\/\/code-plus.jp\/gp\/wp-json\/wp\/v2\/media?parent=9494"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/code-plus.jp\/gp\/wp-json\/wp\/v2\/categories?post=9494"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/code-plus.jp\/gp\/wp-json\/wp\/v2\/tags?post=9494"},{"taxonomy":"group","embeddable":true,"href":"https:\/\/code-plus.jp\/gp\/wp-json\/wp\/v2\/group?post=9494"},{"taxonomy":"pg","embeddable":true,"href":"https:\/\/code-plus.jp\/gp\/wp-json\/wp\/v2\/pg?post=9494"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}