+2Hello!
While testing SF in Universal we discovered that on merge after you resolve a conflict you are not able to come back to your decision as you were in Desktop GUI.
I think this is pretty important since it means if you do something wrong and need to adjust your decision, the session must be rebuilt.
Best answer by Erwin Ekkel
I think you resolved it by using resolve code difference. If I do that I'm also not able to change the value again.
However, this was also not possible to change in 2025.3 wingui:
Indeed with code difference.
Strange because before we did the platform update on main environment, I tested it and was working. Anyway it is strange that you cannot come back to your decision.
We consider this to be a bug, can you report this in TCP as a ticket?
You can deactivate the prefilter then on the main conflict (the green coloured row) you can change the action.
However, your screenshot doesn’t show the conditional layout. Are these open conflicts or are they already resolved?
+2You can deactivate the prefilter then on the main conflict (the green coloured row) you can change the action.
However, your screenshot doesn’t show the conditional layout. Are these open conflicts or are they already resolved?
Hi!
In that screenshot the prefilter was off, the first conflict was resolved and task for resolving again the conflict was no longer available.
I think you resolved it by using resolve code difference. If I do that I'm also not able to change the value again.
However, this was also not possible to change in 2025.3 wingui:
+2I think you resolved it by using resolve code difference. If I do that I'm also not able to change the value again.
However, this was also not possible to change in 2025.3 wingui:
Indeed with code difference.
Strange because before we did the platform update on main environment, I tested it and was working. Anyway it is strange that you cannot come back to your decision.
I think you resolved it by using resolve code difference. If I do that I'm also not able to change the value again.
However, this was also not possible to change in 2025.3 wingui:
Indeed with code difference.
Strange because before we did the platform update on main environment, I tested it and was working. Anyway it is strange that you cannot come back to your decision.
We consider this to be a bug, can you report this in TCP as a ticket?
Enter your E-mail address. We'll send you an e-mail with instructions to reset your password.
