How to add local workspace changes to a newly created stream in a RTC server?
Two developers were working using the same project area and the RTC server machine was corrupted. There was no other option but to create a new server from scratch. Then a stream workspace was created using one developer's local workspace. But now, my problem is how to incorporate second developer's changes into the new stream.
Please help me.
Accepted answer
create a workspace from the stream for developer 2. then load the workspace onto developer2's machine. (save his old files somewhere else)
manually merge developer2's changes into the local sandbox files
then checkin developer2's changes to his workspace, and then deliver developer2's changes to the stream.
manually merge developer2's changes into the local sandbox files
then checkin developer2's changes to his workspace, and then deliver developer2's changes to the stream.