diff --git a/Jenkinsfile b/Jenkinsfile index be41d49..49b1992 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,6 +38,7 @@ pipeline { gitUsernamePassword(credentialsId: 'gitea-jenkins-user-token') ]) { sh ''' + git rebase --abort || true git pull --rebase git stash pop || true git add .