Implement a strategy for identifying & resolving duplicate objects between a branch and main

[jeremystretch]

Plugin Version

v0.4.0

Proposed functionality

Implement a means to detect & rectify the creation of duplicate objects within a branch. For example, consider the following scenario:

1. A site named "Site 1" is created in branch A with ID 101.
2. A site named "Site 1" is created in branch B with ID 102.
3. Branch A is merged into main.
4. Branch B is merged into main, triggering a uniqueness violation because it is attempting to create a second site named "Site 1."

The plugin should identify this collision and provide some mechanism for the user to acknowledge and resolve it. There are a few options for how this might be implemented, though all come with caveats.

We also must consider scenarios in which it is not obvious whether a duplicate object is intentional. Consider the creation of new VLANs or IP addresses for instance: A presumably duplicate VLAN or IP might be intentional or it might be accidental.

Use case

This functionality will help users avoid getting "stuck" within a branch that has not been kept up to date with changes in main.

External dependencies

No response