Locked conflicts

[Former Member]

Hi experts,

While resolving Integration Conflicts, i have selected '' Accept Active" option for few files. These files have not been fixed with resolution. NOW I see them again under Integration Conflicts --> active node even after checkin.  Also from DTR,  these files shows the state "Locked" instead of Resolved. How do I unlock these files and do conflict resolution?

Thanks,

Tony.

[former_member193379]

Hi Tony,

For this, you have to check in and activate this and then checkout again to correct it.

Thanks,

Hamendra

[hemanth2]

Hi Tony,

Hope you are doing good.
I hope that the modifications are being applied to the inactive workspace and then the changes will reach the active workspace upon activation of the respective activity. The correct strategy is to solve the conflict in dev/inactive, activate and release the activity and import it into consolidation. This way the conflict will be solved in all four workspaces.

Further, a prerequisite for conflict resolution is that you have created a project for the affected DC.

You can find all the information in this regard here:

http://help.sap.com/saphelp_nw73/helpdata/en/49/1cf4e8096d16b8e10000000a42189d/content.htm

and http://scn.sap.com/docs/DOC-1178

Hope this helps.

Warm regards,

Hemanth