Skip to main content

Copado User Toolkit Episode 3: Conflict Resolution & Rollbacks

Published Date
Author Team Copado

The fastest relay team in the world won’t win Olympic Gold if they keep botching the baton transfer. In the same way, your development team won’t deliver digital gold if they keep stepping on each others’ toes and overwriting changes. To keep developers on the same page, the Copado DevOps Platform has two collaborative solutions: Automated conflict resolution and rollback support.

You'll Learn

  • Why merge conflicts happen (Spoiler: Git doesn’t play well with XML files)
  • How to leverage Copado Auto Resolve (Based on selections and user story order)
  • When to use Online Conflict Resolution: Exclude specific file types from Auto Resolve
  • How to enable Rollback Support: Rollback changes across Salesforce metadata and nested components