Update make_migrations.sh

增加自动合并而不是在弹出warning结束

Update make_migrations.sh
增加自动合并而不是在弹出warning结束
4fd83bd5 · Nidhoggur1993 · GitHub · aa8bece7 · 4fd83bd5
Unverified Commit 4fd83bd5 authored Apr 03, 2018 by Nidhoggur1993 Committed by GitHub Apr 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

make_migrations.sh utils/make_migrations.sh +2 -0

No files found.
--- a/utils/make_migrations.sh
+++ b/utils/make_migrations.sh
@@ -4,3 +4,5 @@
 python3 ../apps/manage.py makemigrations

 python3 ../apps/manage.py migrate
+
+python3 ../apps/manage.py makemigrations –merge