It's all about the answers!

Ask a question

Merge streams for group of developers using Team Workspace

Kiril Streltsov (312) | asked Feb 06 '14, 2:12 p.m.
Team creates Team Workspace to get changes from another stream.
One team member (Merger) is in charge for getting changes in.
Each individual developer is responsible to resolve conflicts.
Once Merger encounters merge conflict he/she changes Team Workspace to developer responsible for conflict
Developer resolves conflict and changes ownership of workspace back to Merger.
This cycle continues until all scheduled changes are in
In the end team kicks off private build on team workspace to make sure everything is fine and deliver changes to team's development stream

Does following scenario makes sense ?

Accepted answer

permanent link
Arne Bister (2.6k12832) | answered Feb 06 '14, 5:26 p.m.

we strongly recommend to share streams instead of workspaces, especially not to share a sandbox of a loaded workspace between several people. It is cheap in terms of resources and speed to create a team stream and have every developer have their own workspace flow against that stream. That way each individual developer is reponsible to resolve conflicts in their workspace (not disturbing their teammates), delivering them up to the team stream.
The Merger would still get changes in from the other stream into the team stream and developers can then accept these new change sets in their own time, all at once or when their work environment is ready for it.
This is also detailed in article 649.

If this answers your question please mark it as accepted.

Kiril Streltsov selected this answer as the correct answer

Kiril Streltsov commented Feb 07 '14, 6:33 a.m.

Thank you very much Arnie, that helps a lot

Your answer

Register or to post your answer.

Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.