Conflict Analysis

When source changes reach the inbox or import queue of the Merge system, ActiveControl can analyse the changes to determine if there are any conflicts with changes already made in the target development system.

This is done using the ShiftLeft: Conflict Analysis (0005) analysis check.

For performance reasons, ActiveControl only checks whether the changes conflict with changes already made in the target SAP system if the target’s import option “Check whether the same content has been changed in this system before importing” is enabled. When this option is enabled, you must also specify the client in which client dependent changes are analysed. Specify the client in which you make client dependent configuration changes.

If the changes are found to conflict, then unfortunately the production support changes would typically be manually merged with the changes already made in the project development system. Please refer to subsequent Mark as Manually Applied section in this Administration Guide.

!Please note that 0035 Conflict Analysis does NOT need to be switched on in a Merge Target. The important analyser for conflict analysis between parallel Development tracks is aforementioned 0005 Conflict Analysis.

*For customers with BW/BI systems, analyser” BW Conflict Analysis”:https://docs.basistechnologies.com/activecontrol-administration-guide/9.30/en/topic/check-for-bw-object-which-fails (0013) should also be switched on.

Importing changes that do not conflict

Transport requests that do not conflict may be imported automatically, by selecting them in the project development system’s import queue and clicking the Import button.

If the target option “Create a merge transport request in this system after importing changes” is enabled, ActiveControl will create a special transport request, called a merge request, in the project development system after the changes of the import run have been imported. The merge request contains all the items that were on the production support transport requests and is used to transport the same changes to the downstream systems of the project development stream.

ActiveControl automatically associates the merge request with the same tasks (that is, business issues and requirements) as the production support changes. This supports later reconciliation that those business issues and requirements have been applied to the project development stream before the project goes live.