How to cancel a conflict that was resolved Online

When using the Online Conflict Resolution feature to resolve conflicts manually, the resolution of the conflicts is stored in Copado so that it can be used later automatically if that exact same conflict happens again in the same repository. This is called Smart Conflict Resolution.

If you resolve a conflict manually and later you realise the conflict was solved incorrectly, there is a way you can cancel that conflict resolution that was stored. 

Whenever a conflict is resolved manually, an attachment with the resolution is created in the Git Repository record. Deleting that attachment will make Copado forget the resolution and the next time that conflict happens you will have to resolve it manually again.

The attachment with the resolution is located in the related list "Notes & Attachments" in the Git Repository record. That related list is not visible in the visualforce page therefore you will have to override the page doing a url hack. If the the related list is not visible after overriding the VF page, you will have to add it to the page layout.

In order to override the visualforce page you can follow the steps below:
  1. Copy the Git Repository record Id.
  2. Go to the home tab.
  3. Remove home/home.jsp from the url.
  4. Paste GitRepositoryId?nooverride where "GitRepositoryId" is the Git Repository record Id you copied on the step #1
  5. You are now in the standard layout for the Git Repository record, overriding the Visualforce page.

Once you are in the standard page with the "Notes & Attachments" related list, click on the Go to list » link to open the full list of attachments and look for an attachment with a name similar to this one:


Note that the attachment name contains the name of the class where the conflict was resolved, in the example above, "AppleWatch" and the extension ".conflict". If you open the attachment, you will see class after resolving the conflict. This will help you identify the right attachment. By deleting that attachment, Copado will forget the resolution of that specific conflict.


How did we do?