Skip to content
Snippets Groups Projects
Unverified Commit 319d748b authored by Sébastien Blin's avatar Sébastien Blin
Browse files

Jenkinsfile: fix merges

Change-Id: I9848e66358ce36630a201171831f23486ef48c3f
parent b9c3aae6
No related branches found
No related tags found
No related merge requests found
...@@ -142,7 +142,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client ...@@ -142,7 +142,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
# Submodules are generally not managed by merging # Submodules are generally not managed by merging
git merge -X theirs --no-commit FETCH_HEAD || true git merge -X theirs --no-commit FETCH_HEAD || true
git status git status
git checkout FETCH_HEAD -- daemon lrc client-qt git checkout FETCH_HEAD && git add -A
git status git status
""" """
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment