Git衝突（重命名/重命名）

Question

合併分支後，我收到了關於一堆文件的conflict (rename/rename)，創建了file~HEAD和file~my_test_branch。如何解決這些問題？

感謝

Answer 1

考慮下面的測試設置：

git init resolving-rename-conflicts 
cd resolving-rename-conflicts 
echo "this file we will rename" > will-be-renamed.txt 
git add -A 
git commit -m "initial commit" 
git checkout -b branch1 
git rename will-be-renamed.txt new-name-1.txt 
git commit -a -m "renamed a file on branch1" 
git checkout -b branch2 master 
git rename will-be-renamed.txt new-name-2.txt 
git commit -a -m "renamed a file on branch2" 
git checkout master 

然後合併BRANCH1和BRANCH2

git merge --no-ff branch1 
git merge --no-ff branch2 

產量：

CONFLICT (rename/rename): Rename "will-be-renamed.txt"->"new-name-1.txt" in branch "HEAD" rename "will-be-renamed.txt"->"new-name-2.txt" in "branch2" 
Automatic merge failed; fix conflicts and then commit the result. 

git status 

On branch master 
You have unmerged paths. 
    (fix conflicts and run "git commit") 

Unmerged paths: 
    (use "git add/rm <file>..." as appropriate to mark resolution) 

    added by us:  new-name-1.txt 
    added by them:  new-name-2.txt 
    both deleted:  will-be-renamed.txt 

no changes added to commit (use "git add" and/or "git commit -a") 

如果你想保持一個文件，說new-name-2.txt：

git add new-name-2.txt 
git rm new-name-1.txt will-be-renamed.txt 
git commit 

課的艇員選拔一個文件或其他的，你可能有其他變化，使該用名字引用此文件中的文件。另外，如果還有其他未重命名的文件更改，則需要手動對這些分支進行區分和合並，以將它們保留在您保留的文件中。

如果你不是想保留這兩個文件：

git add new-name-1.txt new-name-2.txt 
git rm will-be-renamed.txt 
git commit