Skip to content

[release] Disable git merge to avoid conflict #15267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tqchen merged 2 commits into from
Jul 9, 2023
Merged

[release] Disable git merge to avoid conflict #15267

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
169880c
[release] Disable git merge to avoid conflict
ysh329 Jul 8, 2023
d20ddd4
fix in prepare groovy
ysh329 Jul 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ci/jenkins/generated/arm_jenkinsfile.groovy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ci/jenkins/generated/cortexm_jenkinsfile.groovy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ci/jenkins/generated/cpu_jenkinsfile.groovy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ci/jenkins/generated/docker_jenkinsfile.groovy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ci/jenkins/generated/gpu_jenkinsfile.groovy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ci/jenkins/generated/hexagon_jenkinsfile.groovy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ci/jenkins/generated/i386_jenkinsfile.groovy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ci/jenkins/generated/lint_jenkinsfile.groovy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ci/jenkins/generated/minimal_cross_isa_jenkinsfile.groovy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ci/jenkins/generated/minimal_jenkinsfile.groovy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ci/jenkins/generated/riscv_jenkinsfile.groovy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ci/jenkins/generated/wasm_jenkinsfile.groovy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.