julian/hydra-jobs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workflow: do not use squashed merging

Browse Source
This commit is contained in:
Julian Mutter 2025-03-23 18:45:12 +01:00
parent 9cfe01d3e4
commit e2fa915bdd
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitea/workflows/update-flake.yaml
View File

@ -34,8 +34,7 @@ jobs:
if [ $commits_ahead -ne 0 ] if [ $commits_ahead -ne 0 ]
then then
git fetch origin git fetch origin
git merge -X theirs --squash origin/main git merge -m "Merge main branch $(date -I)" -X theirs origin/main
git commit -m "Merge main branch squashed $(date -I)"
else else
echo "Merge not necessary" echo "Merge not necessary"
fi fi