diff --git a/Jenkinsfile b/Jenkinsfile index 2ea765759059ecb6dfc8d8136c0f00c0cbb9ddff..195cf6526e35f4b8fc5f8e86c0c3981a3f8ab9ec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,9 @@ def pre_test(){ git checkout develop git pull git fetch + git branch -d ${CHANGE_BRANCH} git checkout ${CHANGE_BRANCH} + git pull git merge develop cd ${WK} git reset --hard