[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。
相關文章
- The following untracked working tree files would be overwritten by merge/ git status顯示大量父級目錄檔案Git
- IDEA中分支切換error: The following untracked working tree files would be overwritten by checkout...IdeaError
- 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#
- The Log-Structured Merge-Tree(譯):上Struct
- The Log-Structured Merge-Tree(譯):中Struct
- The Log-Structured Merge-Tree(譯):下Struct
- Working with State
- Why would a reverse index be useful ?Index
- coca would have done 搭配
- working with ASH and AWR
- Initialization Parameter Files and Server Parameter Files (287)Server
- Working with Errors in Go 1.13ErrorGo
- Working with Matplotlib on OSX
- Would you like to develop a story for your character?dev
- Oracle FilesOracle
- This page provides the following types of documentationIDE
- RxSwift (二) Working with SubjectsSwift
- Working With Node.js and RedisNode.jsRedis
- SCC.369 Working with GPIO
- Merge VR欲打造VR遙控器 可以支援ios系統VRiOS
- SMON Following Errors ORA-21779Error
- use multiple tablespaces to perform the following tasks (47)ORM
- Java NIO filesJava
- Upload Files
- Paths和Files
- ffmpeg Preset files
- Get a working copy of a bare repository
- eclipse Working Set設定Eclipse
- fatal: LF would be replaced by CRLF 問題解決
- The above mentioned chinese sex pills nutritional vitamins would
- GIT 提交錯誤 fatal: LF would be replaced by CRLFGit
- GIT 提交異常 fatal: LF would be replaced by CRLFGit
- 題解:UVA124 Following Orders
- Tree
- Vim tips——Working with external commands
- Android working with Volley LibraryAndroid
- ejb object too much ,how server working??ObjectServer