Merging a branch fails if deleting an object modified in another branch

[jeremystretch]

Plugin Version

v0.2.0

NetBox Version

v4.1-dev

Python Version

3.10

Steps to Reproduce

1. Create two branches
2. In branch 1, delete an object.
3. In branch 2, modify some attribute of that object.
4. Attempt to merge branch 1.

Expected Behavior

The branch should be merged successfully.

Observed Behavior

The merge job fails with the following error:

KeyError('description')

Complete job log:

{
    "log": [
        "Merging branch Branch 1 (branch_kqm2ghg3)",
        "Applying change: Tenancy | tenant Wayne Enterprises deleted by admin",
        "'description'"
    ]
}

[linear]

BRA-1 Merging a branch fails

Plugin Version

v0.2.0

NetBox Version

v4.1-dev

Python Version

3.10

Steps to Reproduce

1. Create two branches
2. In branch 1, delete an object.
3. In branch 2, modify some attribute of that object.
4. Attempt to merge branch 1.

Expected Behavior

The branch should be merged successfully.

Observed Behavior

The merge job fails with the following error:

KeyError('description')

Complete job log:

{
    "log": [
        "Merging branch Branch 1 (branch_kqm2ghg3)",
        "Applying change: Tenancy | tenant Wayne Enterprises deleted by admin",
        "'description'"
    ]
}