What are the types of Conflict Resolution processes that can be executed with Copado?

The types of Conflict Resolution processes that can be executed with Copado include Manual Resolution and Auto-resolve. When faced with a conflict during deployment or version control operations, Manual Resolution allows a user to manually address and resolve the conflict by reviewing the changes and making decisions on which versions should be kept. This approach provides flexibility and control to the developer, ensuring that important changes are not unintentionally overwritten.

On the other hand, Auto-resolve acts as a more automated method where Copado attempts to resolve the conflict based on predefined rules or heuristics. This can save time and streamline processes when conflicts are less complex or when the automated logic can reliably make the correct choice.

The other options provide alternative terms but don't align closely with Copado's defined conflict resolution processes. For example, Merge Only and Discard Changes refer more to the methods of handling merges rather than the processes Copado uses, while Skip Resolution and Force Merge imply specific tactics that may not accurately represent the standard conflict resolution terminology associated with Copado. Lastly, Auto-merge and Manual Override are not terms recognized as official processes in Copado's conflict resolution but rather suggest a merge methodology rather than a resolution strategy.