Conflict resolution
With parallel development I found that if the same buscomp server script event were updated by two developers only one of the changes survive when rebasing the workspace. I think the only way to keep both (in this case) is to add back the code the second developer did after rebasing the workspace. If there are other ways, please let me know.