From 3bc4158c818c8d16dde8ff54ed37b2b087d63686 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 17 Jul 2025 08:52:18 +0200 Subject: [PATCH] =?UTF-8?q?make-snapshot:=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/make-snapshot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/make-snapshot.sh b/bin/make-snapshot.sh index e8040d2..4c9bac3 100755 --- a/bin/make-snapshot.sh +++ b/bin/make-snapshot.sh @@ -21,7 +21,7 @@ git checkout -b $BRANCH git mv composer.lock composer.lock.bak git commit -am "Backup composer.lock" -git merge --no-ff -m "Merge latest tag, package pipelines require it" $LATEST_TAG || git checkout --ours composer.lock.bak && git add composer.lock.bak && git commit --no-edit +git merge --no-ff -m "Merge latest tag, package pipelines require it" $LATEST_TAG || (git checkout --ours composer.lock.bak && git add composer.lock.bak && git commit --no-edit) git mv -f composer.lock.bak composer.lock git commit -am "Restore composer.lock" || true # in case composer.lock was not modified