首页
学习
活动
专区
工具
TVP
发布
社区首页 >问答首页 >Git冲突(重命名/重命名)

Git冲突(重命名/重命名)
EN

Stack Overflow用户
提问于 2013-02-06 23:28:22
回答 1查看 28.8K关注 0票数 34

合并分支后,我收到了一堆文件的conflict (rename/rename),并创建了file~HEADfile~my_test_branch。如何解决这些问题?

谢谢

EN

回答 1

Stack Overflow用户

回答已采纳

发布于 2015-01-12 14:17:04

给定以下测试设置:

代码语言:javascript
复制
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

代码语言:javascript
复制
git merge --no-ff branch1
git merge --no-ff branch2

收益率:

代码语言:javascript
复制
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

代码语言:javascript
复制
git add new-name-2.txt
git rm new-name-1.txt will-be-renamed.txt
git commit

当然,在选择一个或另一个文件时,您可能需要对按名称引用此文件的文件进行其他更改。此外,如果对文件进行了其他非重命名更改,在分支上重命名之前或之后,您将需要手动比较和合并这些更改,以便在保留的文件中保留它们。

如果您想同时保留这两个文件:

代码语言:javascript
复制
git add new-name-1.txt new-name-2.txt
git rm will-be-renamed.txt
git commit
票数 25
EN
页面原文内容由Stack Overflow提供。腾讯云小微IT领域专用引擎提供翻译支持
原文链接:

https://stackoverflow.com/questions/14732639

复制
相关文章

相似问题

领券
问题归档专栏文章快讯文章归档关键词归档开发者手册归档开发者手册 Section 归档