Skip to content

Fixes #349: Calculate conflicts for ChangeDiff only when both original and current data exist #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2025
Merged

Fixes #349: Calculate conflicts for ChangeDiff only when both original and current data exist #350

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions netbox_branching/models/changes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,9 @@ def _update_conflicts(self):
"""
Record any conflicting changes between the modified and current object data.
"""
if self.original is None or self.current is None:
# Both the original and current states must be available to compare
return
conflicts = None
if self.action == ObjectChangeActionChoices.ACTION_UPDATE:
conflicts = [
Expand Down