From 319d748b6b5ee89994c665a8d3ea19313a26b351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= <sebastien.blin@savoirfairelinux.com> Date: Tue, 12 Apr 2022 13:48:36 -0400 Subject: [PATCH] Jenkinsfile: fix merges Change-Id: I9848e66358ce36630a201171831f23486ef48c3f --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 97bfdaa0..1dc3be64 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -142,7 +142,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client # Submodules are generally not managed by merging git merge -X theirs --no-commit FETCH_HEAD || true git status - git checkout FETCH_HEAD -- daemon lrc client-qt + git checkout FETCH_HEAD && git add -A git status """ } -- GitLab