try different merging approach

This commit is contained in:
Arne Teuke
2025-05-19 16:11:44 +02:00
parent af83529968
commit f3e6bd8cc7
23 changed files with 2 additions and 4341 deletions

2
Jenkinsfile vendored
View File

@@ -80,6 +80,8 @@ pipeline {
sh '''git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com
echo `git add -A && git commit -am "recommit for updates in build $BUILD_NUMBER"`
git checkout master
git merge jenkins
git push origin HEAD:master'''
}
}