解決error: Your local changes to the following files would be overwritten by merge

阿新 • • 發佈：2019-02-02

在專案裡我們一般都會把自己第一次提交的配置檔案忽略本地跟蹤

1	`[[email protected] demo]$ git update-index --assume-unchanged <filename>`

但是專案裡的其他人如果不小心把該配置檔案修改push到遠端倉庫之後，我們git pull程式碼的時候就會報錯

1 2 3 4 5 6 7 8 9 10 11 12 13

[[email protected] demo]$ git add . [[email protected] demo]$ git commit -m 'update:index.php' [master f8a7428] update:index.php

1 file changed, 1 insertion(+), 1 deletion(-) [[email protected] demo]$ git pull remote: Counting objects: 5, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From git.oschina.net:sunzmit/thinkphp 1bc9485..c63dff3 master -> origin

/master error: Your local changes to the following files would be overwritten by merge: config.ini

大意是：您的本地更改的檔案將被合併覆蓋。並指出了會被覆蓋的檔案

解決方法：

1.撤銷本地對檔案的忽略

1	`[[email protected] demo]$ git update-index --no-assume-unchanged config.ini`

2.從最近的一次提交中讀取內容，備份當前的工作區的內容，將當前的工作區內容儲存到Git棧中

1 2 3 [[email protected] demo]$ git stash Saved working directory and index state WIP on master: f8a7428 update:index.php HEAD is now at f8a7428 update:index.php

3.pull遠端倉庫程式碼

1 2 3 4 [[email protected] demo]$ git pull Merge made by the 'recursive' strategy. config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

4.從Git棧中讀取最近一次儲存的內容，恢復工作區的相關內容

1 2 3 [[email protected] demo]$ git stash pop Auto-merging config.ini CONFLICT (content): Merge conflict in config.ini

5.修改合併

1 2 3 4 5 6 7 8 [[email protected] demo]$ vim config.ini <<<<<<< Updated upstream This is a test file!!!!!!!!!!!!!!!! ======= This is a test file >>>>>>> Stashed changes [[email protected] demo]$ cat test.txt This is a test file

<<<<<<< Updated upstream到=======中是從遠端倉庫pull下來別人的內容，=======到>>>>>>> Stashed changes中是我們本地檔案內容，現在我們可以刪除其他，只保留自己的內容This is a test file

6.把檔案回覆到最新提交的版本，會保留修改內容

1 2 3 4 5 [[email protected] demo]$ git reset HEAD config.ini Unstaged changes after reset: M config.ini [[email protected] demo]$ cat test.txt This is a test file

7.再次忽略本地跟蹤，完成！

1	`[[email protected] demo]$ git update-index --assume-unchanged config.ini`

8.最後不要忘記清除Git棧的備份

1	`[[email protected] demo]$ git stash drop`

本文永久地址：http://blog.it985.com/10665.html
本文出自 IT985部落格，轉載時請註明出處及相應連結。

解決error: Your local changes to the following files would be overwritten by merge

解決方法：

解決error: Your local changes to the following files would be overwritten by merge

git pull遇到錯誤：error: Your local changes to the following files would be overwritten by merge:解決方法

git pull遇到錯誤：error: Your local changes to the following files would be overwritten by merge:

在Linux上git pull線上倉庫代碼時，出現error: Your local changes to the following files would be overwritten by merge

[Git] error: Your local changes to the following files would be overwritten by merge

git pull遇到錯誤：error: Your local changes to the following files would be overwritten by merge

git merge 報錯：error: Your local changes to the following files would be overwritten by m

Git之checkout到別的分支提示Your local changes to the following files would be overwritten by checkout:

【Debug-git】error:. local changes to the following files would be overwritten by merge:.idea/misc.xml

git 上傳至github出現error:your local changes to the following files would to be overwritten解決辦法

git pull 錯誤：The following untracked working tree files would be overwritten by merge

git解決error: The following untracked working tree files would be overwritten by checkout

Py第十九問 Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.

Git 衝突：Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.

Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.

Git Pull Failed ：Your local changes would be overwritten by merge. Commit, stash or revert them

The following untracked working tree files would be overwritten by checkout

git pull報error: Untracked working tree file 'public/images/icon.gif' would be overwritten by merge

The path to the driver executable must be set by the webdriver.gecko.driver system property;

NetBeans IDE驅動報錯The path to the driver executable must be set by the web driver.chrome.driver.system property......

解決error: Your local changes to the following files would be overwritten by merge

解決方法：

相關推薦