diff --git a/Jenkinsfile b/Jenkinsfile
index df6c7b601c0008a2ea9290fc55b413ebc8edfe72..97bfdaa05c3473cb63a2881059716ee8f3005c0a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -140,7 +140,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
                       git reset --hard origin/${params.CHANNEL}
                       git status
                       # Submodules are generally not managed by merging
-                      git merge -X theirs --no-commit FETCH_HEAD
+                      git merge -X theirs --no-commit FETCH_HEAD || true
                       git status
                       git checkout FETCH_HEAD -- daemon lrc client-qt
                       git status