git - 即使在 Jenkins Groovy 中没有冲突，也要合并冲突

Question

我有以下 groovy 脚本将一个分支合并到另一个分支：

git branch: 'master', url: 'https://enterprise_git_url/coverity-jenkins-test.git',  credentialsId: 'temp_functional_sso'

sh 'git checkout coverity'
sh 'git tag -a tagName -m "Merge Master into Coverity"'
sh 'git merge master'
sh 'git commit -am "Merged master branch to coverity'
sh "git push origin coverity"

但它给出了以下错误，即使我可以通过 git bash 合并它：

+ git merge master
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.

标签： gitjenkinsgithubgroovy