4 Commits

Author SHA1 Message Date
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
Johannes Meyer
515540e633 bin/make-snapshot.sh: Merge latest stable again
While git describe isn't used anymore, something else
is and this still requires a reachable tag…

fixes #38
2025-03-26 11:43:44 +01:00
Johannes Meyer
6ba9c56b2c bin/make-snapshot: Do not merge latest stable
It's not required, since git describe is not used
for snapshot package versioning anymore.
2025-03-07 11:44:40 +01:00
Johannes Meyer
bff933320a Add bin/make-snapshot.sh 2021-07-20 10:48:03 +02:00