What does Reordering Required mean?
![]()
We are getting the following message occasionally when delivering:
![]() What is the scenario that leads to this message and what are the consequences? The delivery seems to be successful, but I'm concerned about the impact on the workspace. |
Accepted answer
![]()
Geoffrey Clemm (30.1k●3●30●35)
| answered Nov 25 '13, 12:46 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
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.
Piotr Aniola selected this answer as the correct answer
Comments Geoffrey, thanks for the explanation.
![]() FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
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.
|