From 041a4c15d168dbd586511317db2f75baaa6c3694 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Thu, 31 Dec 2020 09:56:30 +0800 Subject: [PATCH] enhance --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b46c68e2b9..9544343bec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,13 +41,15 @@ def pre_test(){ cd ${WKC} git checkout develop + git reset --hard HEAD~10 git pull git fetch git checkout ${CHANGE_BRANCH} + git reset --hard HEAD~10 git pull git merge develop cd ${WK} - git reset --hard + git reset --hard HEAD~10 git checkout develop git pull cd ${WK} -- GitLab