From 32059536e6815ef0490005f9d33967d86a01dcfb Mon Sep 17 00:00:00 2001
From: Dor dicke Gind <drdickgind@googlemail.com>
Date: Fri, 15 Jul 2022 23:01:59 +0200
Subject: [PATCH] [TASK] modify git update statement

---
 gind-repo-makepkg.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gind-repo-makepkg.sh b/gind-repo-makepkg.sh
index db2e965..dac7f19 100755
--- a/gind-repo-makepkg.sh
+++ b/gind-repo-makepkg.sh
@@ -2,5 +2,5 @@
 SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 cd $SCRIPT_DIR
 
-git submodule update --remote
-git submodule foreach "../makepkg-and-update-db.sh $1"
\ No newline at end of file
+git submodule update --remote --merge --force
+git submodule foreach "../makepkg-and-update-db.sh $1"