使 SVN 分支与主干保持同步
几天前我从树干上分支出来，当时我有一个相同的副本。我对几个文件做了一些修改。
主干进行了一些更改，我想将其合并到我的分支中（以便我与主干保持同步）。因此，当我进行测试合并时使用Tortoise SVN，似乎没有任何冲突，只有添加/删除和修改。
问题是，这怎么可能？
我的解决方案是： 1. 在分支中使用Tortoise SVN 创建补丁并保存文件。 2. 恢复分支中的更改 3.从Trunk合并到分支 4. 在分支中应用补丁
还没有真正尝试过，但我现在就尝试。
如果有人遇到过这种情况并找到了解决方案，请告诉我，如果您认为我的解决方案有效或无效，请告诉我。
谢谢。
I have branched from the trunk few days ago at which point i had an identical copy. I have made some modifications on couple of the files.
The main trunk has had some changes which I want to merge into my branch (so that i am up to date with the trunk). So using Tortoise SVN when i do a Test Merge, there doesn't seem to be any conflicts, only additions/deletions and modifications.
The question is, how is this possible?
My solution is:
1. In the branch create a patch using Tortoise SVN and save the file.
2. Revert changes in the branch
3. Merge from Trunk into branch
4. Apply patch in the branch
Haven't really tried, this but am going to now.
If anyone has come across this situation and found a solution please let me know, and also if you think my solution will or will not work.
Thanks.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论