+6Currently task “Code difference” has been disabled for Control Procedures with same name, same baseline, updated in both branches.
As we have a lot of these situations it would be very helpful if we easily could compare both code-files and make decision.
So please always enable the task in case the object-type and object-name is equal.
+23Now that the merging code difference capability is available in the Universal GUI, this needs some new attention.
Currently when having a merge conflict on a row level, it is not possible to do a code difference in the SF. This should be made possible for objects with a code field in it.
For example when a new default control procedure template was made in both the source and target branch, you’d want the possibility to merge the code together. Right now you are forced to choose A or B and manual fix it after the merge is complete which is a risk to lose code.
+23For example when a new default control procedure template was made in both the source and target branch, you’d want the possibility to merge the code together. Right now you are forced to choose A or B and manual fix it after the merge is complete which is a risk to lose code.
For insert conflicts, the entire record is seen as a conflict; not individual fields. It could (also) be that the description is different between the branches.
Control procedure templates is quite a straightforward scenario for this idea, but for Control procedure, Validations, and some other entities, this idea would not work so well.
We maybe could opt to allow the Code difference for insert conflicts, store the results, and process this after all actions have taken place; updating the code to the desired result. But this would need to be looked at in more detail.
Enter your E-mail address. We'll send you an e-mail with instructions to reset your password.
