Johannes Meyer a3a9a0f9a8 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.

2025-07-09 10:45:14 +02:00

..

make-release.sh

bin/make-release: Don't delete composer.lock

2025-03-06 16:12:06 +01:00

make-snapshot.sh

bin/make-snapshot: Auto resolve composer.lock conflicts

2025-07-09 10:45:14 +02:00