Skip to content
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.

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

Check for the possibility that a TextureId is a number while cloning it. (backport #6933) [release/4.8.x] #7064

Merged
merged 4 commits into from
Aug 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 9, 2024

imodel-native: iTwin/imodel-native#830


This is an automatic backport of pull request #6933 done by [Mergify](https://mergify.com).

…it. (#6933)

Co-authored-by: Paul Connelly <22944042+pmconne@users.noreply.github.com>
Co-authored-by: imodeljs-admin <38288322+imodeljs-admin@users.noreply.github.com>
(cherry picked from commit 2e5b5df)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
#	core/backend/package.json
#	test-apps/display-test-app/android/imodeljs-test-app/app/build.gradle
#	test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app.xcodeproj/project.pbxproj
#	tools/internal/ios/core-test-runner/core-test-runner.xcodeproj/project.pbxproj
@mergify mergify bot added the conflicts label Aug 9, 2024
@mergify mergify bot requested review from a team, aruniverse, calebmshafer and wgoehrig as code owners August 9, 2024 12:47
Copy link
Contributor Author

mergify bot commented Aug 9, 2024

Cherry-pick of 2e5b5df has failed:

On branch mergify/bp/release/4.8.x/pr-6933
Your branch is up to date with 'origin/release/4.8.x'.

You are currently cherry-picking commit 2e5b5dfe3b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   common/changes/@itwin/core-backend/nick-rendermaterial-enhancement_2024-07-03-19-54.json
	new file:   core/backend/src/test/assets/LargeNumericRenderMaterialTextureId.bim
	modified:   core/backend/src/test/standalone/RenderMaterialElement.test.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   common/config/rush/pnpm-lock.yaml
	both modified:   core/backend/package.json
	both modified:   test-apps/display-test-app/android/imodeljs-test-app/app/build.gradle
	both modified:   test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app.xcodeproj/project.pbxproj
	both modified:   tools/internal/ios/core-test-runner/core-test-runner.xcodeproj/project.pbxproj

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@nick4598 nick4598 merged commit 58e2bde into release/4.8.x Aug 12, 2024
14 checks passed
@nick4598 nick4598 deleted the mergify/bp/release/4.8.x/pr-6933 branch August 12, 2024 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants