在分支之間切換會給我錯誤

Question

每次我在分支之間切換時，都會出錯。

我這個做了幾次：

https://help.github.com/articles/dealing-with-line-endings

git rm --cached -r . 
# Remove everything from the index. 


git reset --hard 
# Write both the index and working directory from git's database. 


git add . 
# Prepare to make a commit by staging all the files that will get normalized. 

# This is your chance to inspect which files were never normalized. You should 
# get lots of messages like: "warning: CRLF will be replaced by LF in file." 

git commit -m "Normalize line endings" 
# Commit 

和問題仍然存在。

我.gitattribute文件看起來像這樣：

# Set default behaviour, in case users don't have core.autocrlf set. 
* text=auto 

# Explicitly declare text files we want to always be normalized and converted 
# to native line endings on checkout. 
*.c text 
*.h text 

# Declare files that will always have CRLF line endings on checkout. 
*.sln text eol=crlf 

# Denote all files that are truly binary and should not be modified. 
*.png binary 
*.jpg binary 

我得到的錯誤：

「錯誤：您當地的下列文件中的更改會被檢出覆蓋：」

Answer 1

error: Your local changes to the following files would be overwritten by checkout:

這是因爲某些文件尚未提交到存儲庫。 git add .僅在當前目錄中添加跟蹤文件。爲了解決這個問題，你可以：

• 手動添加的每個文件（git add <file>），給人的完整路徑文件，
• 使用git add -A。

以下是git-add的手冊頁。