Skip to content

Commit 84ed335

Browse files
ysh329ysh329
authored
[release] Disable git merge to avoid conflict (#15267)
* [release] Disable git merge to avoid conflict * fix in prepare groovy
1 parent 683dfb0 commit 84ed335

13 files changed

+38
-25
lines changed

‎ci/jenkins/generated/arm_jenkinsfile.groovy‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci/jenkins/generated/cortexm_jenkinsfile.groovy‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci/jenkins/generated/cpu_jenkinsfile.groovy‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci/jenkins/generated/docker_jenkinsfile.groovy‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci/jenkins/generated/gpu_jenkinsfile.groovy‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci/jenkins/generated/hexagon_jenkinsfile.groovy‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci/jenkins/generated/i386_jenkinsfile.groovy‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci/jenkins/generated/lint_jenkinsfile.groovy‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci/jenkins/generated/minimal_cross_isa_jenkinsfile.groovy‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci/jenkins/generated/minimal_jenkinsfile.groovy‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)