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