Deleting a Custom Object Type Field on a branch results in failed merge

[mrmrcoleman]

Plugin Version

commit 1fd39e7 (HEAD -> main, origin/main, origin/HEAD)

NetBox Version

4.4.2

Python Version

3.12.3

Steps to Reproduce

• Create a COT x
• Add a COTF (text)
• Create and activate a branch
• In the branch delete the COTF
• Merge

Expected Behavior

Either I'm prevented from deleting COTFs on branches, or the merge succeeds

Observed Behavior

ProgrammingError('column "textfield" of relation "custom_objects_7" does not exist')

Note: this appears to then put the instance into a broken state

[arthanson]

I'm not able to reproduce this.

[mrmrcoleman]

Required additional config for branching - added to 0.4.0 docs