From 4fd83bd5be712dbe4b152137f052d50245062323 Mon Sep 17 00:00:00 2001
From: Nidhoggur1993 <Nidhoggur1993@users.noreply.github.com>
Date: Tue, 3 Apr 2018 16:02:51 +0800
Subject: [PATCH] Update make_migrations.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加自动合并而不是在弹出warning结束
---
 utils/make_migrations.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/make_migrations.sh b/utils/make_migrations.sh
index fdf1f6efb..b6068a1ca 100755
--- 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