In addition to Inline Conflict Analysis – ShiftLeft: Conflict Analysis (0005) analyser will automatically highlight any conflicts at the point of Merge.
Within most Basis Technologies’ customer implementations of ActiveControl, this is typically done during an Inbox approval prior to Merge.
ShiftLeft: Conflict Analysis (0005) will be seen in the Web Platform by the Approver in the Merge Inbox (or other location where it is configured). This highlights any conflicting transports in the target Development track, ie where the same objects have been changed as those contained within the Transport(s) about to be Merged. In the event of a conflict, the relevant customer stakeholders would typically review the Conflict and make a decision on how best to mitigate the conflict. This will typically depend on factors such as the size/scope of the Transport about to be merged, and the conflict Transport in the target Development track, whether the conflicting Transport has already been released and/or deployed etc.
If the stakeholders reach decision to manually rekey the source change instead of using ActiveControl Merge, Mark as Manually Applied can be used to reflect this within ActiveControl.
Figure: Example of ShiftLeft: Conflict Analysis (0005) in the Web Platform. In this example, ACDK930965 is about to be merged, but conflicts with D00K904567 as they both contain the ZRMCL_CONFLICT_EXAMPLE program.