[Feature Request] Enable Configuration of Conflict Resolution Strategies

[matt-ramotar]

Many use cases will not want to pull immediately after failing to push local changes. We should enable configuration of conflict resolution strategies, such as logging, retrying, canceling.