mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 18:16:19 +00:00
Code Issues 25 Releases Wiki Activity
75d0dcbf84
django/tests/migrations/test_migrations_conflict
History
Andrew Godwin 3b8e46cbc7 Migration VCS conflict detection and --merge for makemigrations
2013-12-04 16:01:49 +00:00
..
__init__.py Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00
0001_initial.py Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00
0002_conflicting_second.py Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00
0002_second.py Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00