Netbox Branch merge fails, what do I do?

[postilion]

I created a branch to model installation of a new firewall. We've done this before. In this case, however, when merging I get an error message and I've got not idea what to do to fix things. Several hours work has gone into this, so Start Over is not the correct answer.

Netbox v4.3.4, branching plugin v0.6.0, with this in configuration.py:

PLUGINS = [
  'netbox_aws_vpc_plugin',
  'netbox_reorder_rack',
  'netbox_branching',
]

The error I get is this:

{
    "log": [
        "Merging branch bd-fw-replace (branch_8kdljm1q)",
        "Found 176 changes to merge",
        "Setting branch status to merging",
        "Applying change DCIM | interface IPMI (P11) created by admin.nic.bernstein using default",
        "Creating interface <DeserializedObject: dcim.Interface(pk=7733)>",
        "Applying change DCIM | interface LAGG0 (LAN LAGG) created by admin.nic.bernstein using default",
        "['Invalid WWN format: ']: (dcim.interface:pk=7734) field_value was ''"
    ]
}

Anyone have any suggestions? I haven't seen any issues or forum questions like this. I have moved this question over from the Netbox forum, as I think it belongs here instead.

Thanks in advance,
-nic

[mhudrlik]

This is a bad answer I'm sure, but I ran into issues with merging the branch. I wound up going into the DB and modifying the changes to valid values and then when it replayed the actions to merge it worked. I did have to go in and verify things were good and fix a couple of the things that I had changed, but it seems like that is the way you have to go sadly.

The table that I made modifications in was netbox_branching_changediff in the postgresql DB.