This commit is contained in:
Laurent Destailleur 2026-02-28 11:51:01 +01:00
parent e30a4376af
commit 189b762162

View file

@ -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 ..