Conflicts when deploying #119
Description
When deploying using the MCP I have ran into a lot of cases where conflicts cause the deploy to fail. There is currently no tool present to handle deploying with conflicts which results in a failed deploy and the Agent spinning trying to figure out how to deploy without tools.
In our workflow on scratch orgs conflicts are quite common, most likely due to usage of template orgs to setup our environments, leading to most developers always passing the -c flag to the SF CLI to ignore conflicts. We also know that conflicts are issues on the side of the org as we work with each developer using their own scratch org, so the code is the source of truth and conflicts are always incorrect on the org
It would be good for the tools here to have a way to resolve conflicts, given that as an organisation we ignore conflicts most of the time it would be better if there was a config that could be set to always ignore conflicts or a specific tool that will always ignore conflicts and be preferred if enabled.