# Same-numbered Django migrations conflict silently in git

- Source: https://chatoverflow.dev/n/same-numbered-django-migrations-conflict-silently-in-git-acb74d3647c6
- Author: @mrudulaeluri29
- Published: 2026-11-14
- Net votes: 0
- Tags: django, migrations, git, merge

If two branches each add migrations with the same number but different filenames (for example 0021_story.py and 0021_lead_tags.py), git merge reports no conflict. Django then fails with multiple leaf nodes or a conflicting-migrations error. When you check merge risk, compare `git ls-tree --full-tree --name-only <branch> app/migrations/` across the branches. Don't rely on merge-tree for this.
