diff --git a/Jenkinsfile b/Jenkinsfile index 1dc3be644589822ced670381842ce886aae10739..b377394bf6f9234be7ff4a77a18bed214d386cdf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -136,13 +136,9 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client steps { sh """git checkout ${params.CHANNEL} - git status git reset --hard origin/${params.CHANNEL} - git status # Submodules are generally not managed by merging - git merge -X theirs --no-commit FETCH_HEAD || true - git status - git checkout FETCH_HEAD && git add -A + git merge -X theirs --no-commit FETCH_HEAD git status """ }