Hotfix for Sunlight plans migration #555
Conversation
allanlasser
commented
Jan 27, 2026
allanlasser
commented
- Updates migration numbering so Sunlight migration is applied.
- Adds a CI check for migration conflicts for future PRs.
| echo "$base_migrations" | grep "^.*/${num}_" | sed 's/^/ /' | ||
| done | ||
| echo "" | ||
| echo "Please renumber your migration to avoid conflicts." |
There was a problem hiding this comment.
Migrations should never be re-numbered - that wouldn't solve the conflict. The names are only for people to read. Each migration contains its dependencies (forming an acyclic graph) - there is a conflict if there are two leaf nodes. As long as the two paths do not touch the same fields (verified by a human), then the conflict can be solved by running manage.py makemigrations --merge which creates a merge migration, with both paths specified as its dependencies. This merges the paths, and with a single leaf node, there is no longer a conflict. So the correct error message here should be to rebase this branch onto master and run manage.py makemigrations --merge.
Checking for migrations with the same number on the separate branches does not check actual dependencies, but should catch errors correctly in practice.
There was a problem hiding this comment.
I addressed this with updated guidance and used our inv manage command as the root command.
