What does Reordering Required mean?
Accepted answer
It looks like the warning message needs to be updated to say "it may produce conflicts in your workspace". But in any case, you should not have to be concerned when you get this message (you will never lose any of your change sets). In the worst case, it will result in conflicts in this workspace, which you will need to resolve before you can deliver. If you ever encounter a case where the conflicts occur but are not trivial to resolve, please follow-up.
Comments
Geoffrey, thanks for the explanation.
Could you please let me know what is the scenario with which this message can been reproduced?
Also, what exactly does it mean that the conflicts are trivial to resolve?
For reproducing the situation that causes this message, I'll have to defer to the RTC SCM dev team. As to what it means that the conflicts are trivial to resolve ... in my experience, the two contributors to the merge will have the same content, so you can just select "auto-resolve" to resolve the conflicts.
thank you, although I'm confused now.
If the two sides of the conflict have the same content, why is there a conflict in the first place?