处理冲突

add545db · 前端-钟卫鹏 · fb50068e · add545db
Commit add545db authored Mar 29, 2022 by 前端-钟卫鹏
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Jenkinsfile Jenkinsfile +0 -4

No files found.
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -70,11 +70,7 @@ pipeline {
                    sh "echo JOB_BASE_NAME : ${env.JOB_BASE_NAME}"
                    sh "echo BRANCH_NAME 当前分支 : ${env.BRANCH_NAME}"
                    sh "echo BUILD_ENV 当前环境 : ${env.BUILD_ENV}"
-<<<<<<< HEAD
                    // sh "echo commit 当前提交 : ${env.GIT_COMMIT_MSG}"
-=======
-                    // sh "echo COMMIT 当前提交 : ${env.GIT_COMMIT_MSG}"
->>>>>>> c69c26b3a1c106c7bff8a749cb33f4f22c24984a
                    sh "echo WORKSPACE : ${env.WORKSPACE}"
                    sh "echo GIT_BRANCH : ${env.GIT_BRANCH}"
                    sh "echo BUILD_NUMBER : ${env.BUILD_NUMBER}"