starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-11 21:10:29 +01:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Fix merge conflict resulting from #17602 #10919

New Issue
Closed
opened 2025-12-29 21:37:43 +01:00 by adam · 0 comments
adam commented 2025-12-29 21:37:43 +01:00
Owner
Copy Link

Originally created by @bctiemann on GitHub (Mar 19, 2025).

Originally assigned to: @bctiemann on GitHub.

Proposed Changes

#17602 introduced a migration conflict (0018_contact_groups, 0018_contactgroup_comments_tenantgroup_comments in tenancy) that needs to be resolved.

Justification

Required for clean build.

Originally created by @bctiemann on GitHub (Mar 19, 2025). Originally assigned to: @bctiemann on GitHub. ### Proposed Changes #17602 introduced a migration conflict `(0018_contact_groups, 0018_contactgroup_comments_tenantgroup_comments in tenancy)` that needs to be resolved. ### Justification Required for clean build.
adam added the status: acceptedtype: housekeeping labels 2025-12-29 21:37:43 +01:00
adam closed this issue 2025-12-29 21:37:44 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
beta
breaking change
complexity: high
complexity: low
complexity: medium
needs milestone
netbox
pending closure
plugin candidate
pull-request
Mirrored from GitHub Pull Request
 severity: high
severity: low
severity: medium
status: accepted
status: backlog
status: blocked
status: duplicate
status: needs owner
status: needs triage
status: revisions needed
status: under review
topic: GraphQL
topic: Internationalization
topic: OpenAPI
topic: UI/UX
topic: cabling
topic: event rules
topic: htmx navigation
topic: industrialization
topic: migrations
topic: plugins
topic: scripts
topic: templating
topic: testing
type: bug
type: deprecation
type: documentation
type: feature
type: housekeeping
type: translation
No Label status: accepted type: housekeeping
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
adam
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/netbox#10919
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?