diff --git a/Jenkinsfile b/Jenkinsfile index 8cae61d..8644257 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,6 +40,7 @@ pipeline { ]) { sh ''' git checkout main + git rebase --abort git pull --rebase git merge build-${BUILD_NUMBER} --no-ff -m "Merge build ${BUILD_NUMBER}" git push