Prevent a branch from being merged until all of its conflicts have been addressed

[jeremystretch]

Plugin Version

v0.2.0

Proposed functionality

Do not permit a branch to be merged until all of its conflicts have been resolved or acknowledged. A conflict is defined here as an object which has been modified in both the main and branch schemas with conflicting attributes.

For example, suppose Site A's description is changed from an empty string to two different values in the primary and branch schemas. Merging the branch in this scenario would effect data loss, as the value defined in the primary schema will be overwritten.

The user should be alerted to each such conflict and prompted to take one of three actions:

1. Keep the current value (ignoring the change within the branch)
2. Disregard the conflict (which may be expected) and apply the change
3. Abort the application of the branch

Use case

This will mitigate unintentional data loss while still preserving an optional path forward in the event such loss is deemed acceptable by the user.

External dependencies

No response