How to best handle multiple developers working on overlapping files?
Developers are new to RTC. My question is specific to merge effort in the team of 4 developers delivering change sets once a day. Accept before Deliver will be applied.
Lighter side, dev2,3,4 cannot Check-In change sets until dev1 releases the merged code.
Will this strict merge procedure reduce the Merge effort. Should we start our RTC SCM process this way.
If Developers merge at their own will & wish, will it not end up with more effort from developer's side. Atleast to start with it would be difficult for the team to understand how the RTC Change Set Delivery Accept work in Merge scenario.
|
One answer
Geoffrey Clemm (30.1k●3●30●35)
| answered May 06 '20, 11:19 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER Developers will not be able to deliver to the Dev Stream if there are any conflicts between their changes and what has already been delivered by other developers. The simplest approach is to just have each developer does their own merging. If you really must have just the lead developer do all the merging, then you can do the following:
- Add flow targets to the dev1 workspace from the workspaces of dev2, 3, and 4.
- Dev1 accepts changes from the other workspaces, does the merging, and then delivers.
- Each other developer either waits until all their changes have been delivered to the team stream before accepting those changes into their workspace and making any new changes, or creates a new workspace based on the current state of the team stream, and makes new changes in the new workspace.
|
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.
Comments
Note: This question was extracted from https://jazz.net/forum/questions/268773