diff --git a/Jenkinsfile b/Jenkinsfile index 84df864..d86d548 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,10 +67,11 @@ } } -def gitMerge(fromBranch, intoBranch, msg) { +def gitMerge(from, into, msg) { sh(""" -git checkout ${intoBranch} -git merge ${fromBranch} -m '${msg}' +git checkout ${from} +git checkout ${into} +git merge ${from} -m '${msg}' """) }