Merge Conflict Resolution is live!
about 1 year ago by Nico B
Fail fast, review conflicts, and smoothly merge changes with peace of mind š With Merge Conflict Resolution, Blue Canvas detects on-the-fly if your deployment is conflicting with other changes that happened on the destination org.
In case of conflicting changes on the same code/metadata block you'll be guided through a dedicated panel to resolve the conflict. And when changes are clearly distinct in the diff, Blue Canvas will even let you auto-merge!