From 189b76216231e166e6a17e26dcc5a285e2fe0b55 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 28 Feb 2026 11:51:01 +0100 Subject: [PATCH] Debug --- dev/pullmerge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/pullmerge.sh b/dev/pullmerge.sh index 8dd37d975eb..d2005d3efe3 100755 --- a/dev/pullmerge.sh +++ b/dev/pullmerge.sh @@ -111,7 +111,7 @@ if [ "x$param1" = "xall" ] || [ "x$param1" = "xmerge" ]; then git remote add $REMOTE_NAME "../dolibarr_$END.0" git fetch $REMOTE_NAME - git merge "$REMOTE_NAME/dolibarr_$END.0" -m "Automated merge from $END.0 to $DEV_BRANCH" && git push || exit 1 + git merge "$REMOTE_NAME/$END.0" -m "Automated merge from $END.0 to $DEV_BRANCH" && git push || exit 1 git remote remove $REMOTE_NAME cd ..