We also have several teams, our sprints are aligned, and we integrate continuously: when a story is complete. This is sometimes annoying, but that way we avoid long integration periods that could be painful. Each story is developped in a separate branch, and then integrated in the main branch. When two teams needs to share something that is not integrated, they work in the same branch.
We're building a packaged product, so deployment is not an issue for us.
The two questions are tied together: if you only integrate at the end of the sprints, which I'd not recommend, then you're better off staggering the sprints.
We have two teams with synchronized sprints and it seems to work quite well. Our strategy is to keep the stories small. Get the stories done and publish them up to trunk often during the sprint. Yes we do get merge conflicts but they are manageable.
Oh and make sure the teams communicate well with each other.
Continuous Integration. Integrate all the time, at every check-in, don't wait till the end of the day or end of an iteration to integrate. Have unit tests, and automated acceptance tests that run on every check-in to ensure that no one breaks the code.
Plan smaller features, work on smaller pieces of work. Smaller chunks are easier to fix when things break. Are all the teams working on the same product / code line ? You can try planning the features so that the features don't affect the features another team is working on. Try attending the other team's stand-ups so you can resolve integration conflicts earlier. Share the work if features conflict.
发布评论
评论（3）
我们也有几个团队，我们的冲刺是一致的，并且我们不断地整合：当一个故事完成时。 这有时很烦人，但这样我们就可以避免长时间的集成期，这可能会很痛苦。 每个故事都在单独的分支中开发，然后集成到主分支中。 当两个团队需要共享未集成的东西时，他们会在同一个分支中工作。
我们正在构建一个打包产品，因此部署对我们来说不是问题。
这两个问题是联系在一起的：如果您只在冲刺结束时进行集成（我不建议这样做），那么您最好错开冲刺。
Henrik Kniberg（Scrum 和 XP 的作者）撰写了一篇关于 的文章多个敏捷团队的版本控制。
We also have several teams, our sprints are aligned, and we integrate continuously: when a story is complete. This is sometimes annoying, but that way we avoid long integration periods that could be painful. Each story is developped in a separate branch, and then integrated in the main branch. When two teams needs to share something that is not integrated, they work in the same branch.
We're building a packaged product, so deployment is not an issue for us.
The two questions are tied together: if you only integrate at the end of the sprints, which I'd not recommend, then you're better off staggering the sprints.
Henrik Kniberg (author of Scrum and XP from the trenches) wrote an article on Version Control for Multiple Agile Teams.
我们有两个团队同步冲刺，看起来效果很好。 我们的策略是让故事保持小规模。 在冲刺期间经常完成故事并发布到主干。 是的，我们确实遇到了合并冲突，但它们是可以管理的。
哦，还要确保团队之间沟通良好。
We have two teams with synchronized sprints and it seems to work quite well. Our strategy is to keep the stories small. Get the stories done and publish them up to trunk often during the sprint. Yes we do get merge conflicts but they are manageable.
Oh and make sure the teams communicate well with each other.
看看这篇文章，简洁地解释了这些问题。 http://www.infoq.com/news/2008/ 04/kniberg-agile-version-control
持续集成。 在每次签入时始终进行集成，不要等到一天结束或迭代结束时才进行集成。 进行单元测试，并在每次签入时运行自动验收测试，以确保没有人破坏代码。
规划更小的功能，处理更小的工作。 当出现问题时，较小的块更容易修复。
所有团队是否都在同一产品/代码行上工作？
您可以尝试规划功能，以便这些功能不会影响其他团队正在开发的功能。
尝试参加其他团队的站立会议，以便您可以更早地解决集成冲突。 如果功能冲突，则共享工作。
have a look at this article, explains these issues succinctly. http://www.infoq.com/news/2008/04/kniberg-agile-version-control
Continuous Integration. Integrate all the time, at every check-in, don't wait till the end of the day or end of an iteration to integrate. Have unit tests, and automated acceptance tests that run on every check-in to ensure that no one breaks the code.
Plan smaller features, work on smaller pieces of work. Smaller chunks are easier to fix when things break.
Are all the teams working on the same product / code line ?
You can try planning the features so that the features don't affect the features another team is working on.
Try attending the other team's stand-ups so you can resolve integration conflicts earlier. Share the work if features conflict.