Smart Conflict Resolution

Updated 1 year ago by Copado Solutions

Conflict resolution is smarter in Copado thanks to the Smart Conflict Resolution feature.

When you manually resolve conflicts online, Copado will learn about these conflicts and how they have been resolved without prompting you again. The conflict will be marked as AUTO RESOLVED and it will document this smart auto resolve in the merge commit message as follows: "Smart online merged". This means that Copado has re-used a previous online conflict resolution automatically.

Additional Reading

How did we do?