From a65d0f29e594914dd9659af3f03bd5c9f3bf2bb3 Mon Sep 17 00:00:00 2001
From: Parsa Nazer <parsa.nazerrr@gmail.com>
Date: Mon, 27 Jan 2025 21:32:47 +0330
Subject: [PATCH] update docker comopse up

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e6d7f15..61ab781 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,7 +24,7 @@ services:
             [
                 "sh",
                 "-c",
-                "python manage.py migrate && python manage.py runserver 0.0.0.0:8000",
+                "python manage.py makemigrations --merge && python manage.py migrate && python manage.py runserver 0.0.0.0:8000",
             ]
         networks:
             - default