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

[PR #18957] [MERGED] Fixes: #18956 - Fix migration conflict in tenancy #15489

New Issue
Closed
opened 2025-12-30 00:22:14 +01:00 by adam · 0 comments
adam commented 2025-12-30 00:22:14 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/18957
Author: @bctiemann
Created: 3/19/2025
Status: ✅ Merged
Merged: 3/19/2025
Merged by: @jnovinger

Base: feature ← Head: feature-fix-migration-conflicts-tenancy

📝 Commits (1)

  • 715fd19 Fix migration conflict in tenancy

📊 Changes

1 file changed (+1 additions, -1 deletions)

View changed files

📝 netbox/tenancy/migrations/0019_contactgroup_comments_tenantgroup_comments.py (+1 -1)

📄 Description

Fixes: #18956

Resolve migration conflict.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/netbox-community/netbox/pull/18957 **Author:** [@bctiemann](https://github.com/bctiemann) **Created:** 3/19/2025 **Status:** ✅ Merged **Merged:** 3/19/2025 **Merged by:** [@jnovinger](https://github.com/jnovinger) **Base:** `feature` ← **Head:** `feature-fix-migration-conflicts-tenancy` --- ### 📝 Commits (1) - [`715fd19`](https://github.com/netbox-community/netbox/commit/715fd19440056863003a168cbb4a5527ac8b23e7) Fix migration conflict in tenancy ### 📊 Changes **1 file changed** (+1 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `netbox/tenancy/migrations/0019_contactgroup_comments_tenantgroup_comments.py` (+1 -1) </details> ### 📄 Description ### Fixes: #18956 Resolve migration conflict. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-30 00:22:14 +01:00
adam closed this issue 2025-12-30 00:22:14 +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 pull-request
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#15489
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?