TortoiseSVN主干和分支合并
[英]TortoiseSVN trunk and branches merging
问题描述
I'm no SVN expert or come from that background so I'm not very sure what I'm going to ask is stupid or it makes any sense to you. 
我不是SVN专家或者来自那个背景所以我不太确定我要问的是愚蠢或者对你有意义。 Here it goes. 在这里。
The team I working with is adopting SVN and we're currently doing dev on branch. 我合作的团队正在采用SVN，我们目前正在开发分支机构。 Everytime we done something, we have to manually replicate everything back to trunk (Yes, manually redo line-by-line into the trunk code). 每次我们做某事时，我们都必须手动将所有内容复制回主干（是的，手动重新逐行重做到主干代码中）。
I'm not sure how everyone else do it with SVN, but apparently, this seems so wrong for me. 我不确定其他人是如何用SVN做的，但显然，这对我来说似乎是错误的。
There got to be a better way of doing this, SVN merging for example? 必须有一个更好的方法来做到这一点，例如SVN合并？ (although I don't really understand how SVN merge the code and resolving conflicts etc) （虽然我真的不明白SVN如何合并代码和解决冲突等）
Can someone shed some light please? 有人可以解决一些问题吗？
1 个解决方案
解决方案1
2 已采纳 2013-06-25 05:13:43
Yes, using SVN merging is the right way. 是的，使用SVN合并是正确的方法。 Doing it via (for example) TortoiseSVN make it (mostly) easy. 通过（例如）TortoiseSVN来实现它（大多数情况下）很容易。 Screenshot below shows you the merge options to chose. 下面的屏幕截图显示了要选择的合并选项。
One hint for merging: to have a correct trunk-branch relation is a good base for less conflicts. 合并的一个提示：拥有正确的主干分支关系是减少冲突的良好基础。 Merging conflicts is like you said "reading line-by-line" of conflict and decide witch line is the correct one. 合并冲突就像你说的“逐行阅读”冲突并决定女巫线是正确的。
But first of all I can recommend you site like this to get into the topic. 但首先 ，我可以推荐你的网站像这样获得进入正题。 After that feel free to come back here with special (concrete) problems. 之后，随时可以回到这里遇到特殊（具体）问题。 You are not a new user so I think you know how to use SO :-) 你不是新用户，所以我想你知道如何使用SO :-)
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.