问题描述
有人可以向我解释分支和合并背后的过程吗?我不知道我做错了什么,但合并却非常错误.这是我的情况:
Could someone explain to me the process behind branching and merging? I don't know if I am doing something wrong but my merges are going very wrong. Here is my scenario:
我的存储库如下:
/repo
|- branches
|- tags
|- trunk
|- readme.txt //readme stores v1.0
现在我需要建立2个分支; 1表示新更改,2表示错误修复,它们如下:
Now I need to make 2 branches; 1 for new changes and 2 for bug fixes and they are as follows:
/repo
|- branches
|- dev
|- readme1.txt //readme renamed to readme1 and stores v1.0
|- readme2.txt //this file is empty
|- bugfix
|- readme.txt //readme stores v2.0
|- tags
|- trunk
|- readme.txt //readme stores v1.0
详细信息是:
- "dev"和"bugfix"都是到同一修订版创建的干线的直接分支
- 1个人对错误修正进行了更改(请参见图表顶部)
- 另一个人将其重命名为readme.txt,进行了一些修改并创建了一个新文件.
因此,当所有更改都合并到主干时,应如下所示:
So when all changes are to be merged to the trunk it should be as follows:
/repo
|- branches
|- tags
|- trunk
|- readme1.txt //readme stores v2.0
|- readme2.txt //this file is empty
要获得此结果,我应该如何继续合并我的文件?我确实尝试过:
To achieve this result, how should i proceed to merge my files?I did try:
- 合并"dev"和"bugfix"不起作用,因为我的文件被覆盖而不是被合并
- 将错误修正"合并为"trunk",然后将"dev"合并为"trunk",这也无法正常工作,因为我的文件仍被覆盖而不是被合并
我正在使用Tortoise SVN连接到Apache Subversion存储库.我真的很讨厌尝试合并,而且上帝知道我从结帐的所有文件夹中尝试了多少次.希望有人能帮助我.
I am using Tortoise SVN connecting to an Apache Subversion repository. I really tired of trying to merge and god knows how many times i tried from all the folders that i checkout. Hope someone can help me.
推荐答案
Here is a discussion on the bug for svn move tracking: Subversion not merging changes into renamed files?
这篇关于合并颠覆分支的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持!