Jenkinsfile: fix merge

Change-Id: I45428dbf670683f9039dd796a2d8c811c5c339e4

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
                    """
             }