分支和合并到修改后的结账
您好,有一个存储库签出 (SVN),它已被团队成员进行了大量修改。我们现在希望有超过 1 名的成员参与开发,以加快开发速度。为了防止任何覆盖,如果他们都可以处理此修改后的结账的单独副本,然后将它们的更改合并在一起,那就太理想了。
有没有办法在 Subversion/TortoiseSVN 中做到这一点?如果没有的话,在 git 中设置是否容易?
相关内容:
Hi have a repository checkout (SVN) which has been heavily modified by a team member. We would now like to get more than 1 member on the development to speed it up. In order to prevent any overwrites, It would be ideal if they could both work on seperate copies of this modified checkout and then merge their changes together.
Is there a way to do this in Subversion/TortoiseSVN? If not, is it an easy of a setup in git?
Related to:
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(2)
在 TortoiseSVN
这将从修改的签出中创建一个新分支。团队成员都可以签出该分支并可以同时工作。当他们完成功能后,他们可以将更改合并回原始存储库。
请参阅此在线帮助了解更多详细信息。
In TortoiseSVN
This will create a new branch from modified checkout.Both the team members can check out this branch and can work simultaneously. When they are done with feature, they can merge their changes back to original repository.
Look at this online help for more details.
在 svn 中,我可能会创建一个分支,将所有这些更改签入其中,并让开发人员在该分支上进行协作,提交他们认为合适的更改。
一旦完成,所有更改(或其中一些)都可以重新集成到上游。
In
svn
, I would probably create a branch, check all those changes into it, and let the developers collaborate on that branch, committing changes as they see fit.Once they are done, all changes (or just some of them) can be reintegrated into the upstream.