We have a large team, and they will have various repository-ws and eclipse-ws for a stream with a component. We need to refactor this component into two, and will be moving some Eclipse projects to the other component.

While, in the ideal world, we would ask everyone to check in their changes and deliver them to the stream before we do this refactoring, there will be some people who will have work-in-progress, and won't be able to do this.

After the refactoring, their repository-ws's will have Incoming changes representing the move of the component. If they have changes in their repo-ws, this will be a conflict (their change for file A in project B in component C, but an incoming change that deletes project B from component C, and puts it into a new component D).

Does RTC have a way to resolve this merge conflict? Is it automatic, and if not, what steps does a user need to do to resolve it?