From a3a9a0f9a8449974ad52dcfbd5b1f1512e6e8bdb Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 9 Jul 2025 10:35:48 +0200 Subject: [PATCH] bin/make-snapshot: Auto resolve composer.lock conflicts dependabot seems to use an older composer version, causing conflicts with the property `plugin-api-version`. Anyway, the merge leading to the conflict is only done to make a tag reachable. So the composer.lock of the main branch is always the right choice. --- 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 8b832e3..71ee4eb 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 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"