Smart Conflict Resolution

Updated 5 days ago by Copado Solutions

Conflict resolution is smarter now in Copado thanks to this new feature. From now on, when manually resolving conflicts on-line, Copado will learn about these conflicts and how to resolve them without prompting the user 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?