[iOS]The following untracked working tree files would be overwritten by merge
[THE FOLLOWING UNTRACKED WORKING TREE FILES WOULD BE OVERWRITTEN BY MERGE]
git pull的時候遇到這樣的問題:
The following untracked working tree files would be overwritten by merge balabala...
解決辦法:
git clean -d -fx
備註:會刪除掉沒有add到倉庫的檔案,操作記得慎重,以免改動檔案的丟失。本質上就是操作倉庫中沒有被追蹤的本地檔案
$ git clean -f -n # 1
$ git clean -f # 2
$ git clean -fd # 3
$ git clean -fX # 4
$ git clean -fx # 5
(1): 選項-n將顯示執行(2)時將會移除哪些檔案。
(2): 該命令會移除所有命令(1)中顯示的檔案。
(3): 如果你還想移除檔案件,請使用選項-d。
(4): 如果你只想移除已被忽略的檔案,請使用選項-X。
(5): 如果你想移除已被忽略和未被忽略的檔案,請使用選項-x。
相關文章
- IDEA中分支切換error: The following untracked working tree files would be overwritten by checkout...IdeaError
- The following untracked working tree files would be overwritten by merge/ git status顯示大量父級目錄檔案Git
- git pull遇到錯誤:error: Your local changes to the following files would be overwritten by merge:GitError
- C# split big file into small files as, and merge the small files into big oneC#
- Working with Matplotlib on OSX
- Working with Errors in Go 1.13ErrorGo
- Vim tips——Working with external commands
- SCC.369 Working with GPIO
- Get a working copy of a bare repository
- coca would have done 搭配
- Upload Files
- Would you like to develop a story for your character?dev
- 題解:UVA124 Following Orders
- SharePoint 2013 workflows stop working (Failed on started.)AI
- Paths和Files
- ffmpeg Preset files
- Java NIO filesJava
- sql merge intoSQL
- Merge Or Rebase
- git mergeGit
- ou have not concluded your merge (MERGE_HEAD exists)
- The following instances are in the device manifest but not specified in framework compatibility matrix:devFramework
- Android: The following classes could not be instantiated: 解決方法Android
- Chapter 5:Perl One-Liners:Working with Arrays and StringsAPT
- OGG4DB2 for IBM i PURGEOLDEXTRACTS not workingDB2IBM
- OMS Log Files 位置
- Missing MSI and MSP files
- 4.3.2.2.2 Oracle Managed FilesOracle
- JavaScript files 屬性JavaScript
- Install/uninstall .deb files
- Reset and Checkout Files in GitGit
- git merge origin master git merge origin/master區別GitAST
- fatal: LF would be replaced by CRLF 問題解決
- Git錯誤fatal: CRLF would be replaced by LF in xxxGit
- SQLServer MERGE 用法SQLServer
- merge into 用法深思
- merge into基本用法
- Polyphase Merge Sort