在合并分支后,我收到了许多文件的“冲突(重命名/重命名)”,并创建了“file~HEAD”和“file~my_test_branch”。如何解决这些问题?
谢谢
谢谢
考虑以下测试设置:
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
然后合并分支1和分支2
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