tyler.durden/icinga-php-thirdparty
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-php-thirdparty.git synced 2025-07-20 12:14:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Johannes Meyer 2025-07-09 10:35:48 +02:00
parent 6c862b2ab8
commit a3a9a0f9a8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/make-snapshot.sh
View File

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