Skip to content
Snippets Groups Projects
Commit 2ca0e939 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

jenkinsfile: update from master branch

Change-Id: I2e5736d4304bb841c8ec86d883b7bc0641669881
parent 880936d2
No related branches found
No related tags found
No related merge requests found
......@@ -136,7 +136,8 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
steps {
sh """git checkout ${params.CHANNEL}
git merge --no-commit FETCH_HEAD
# Submodules are generally not managed by merging
git merge -X theirs --no-commit FETCH_HEAD || git add `git diff --name-status --diff-filter=U | awk '{print \$2}'`
"""
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment