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

Update immer to ^9.0.1 (bp #1027) #1039

Merged
merged 4 commits into from Mar 26, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 25, 2021

This is an automatic backport of pull request #1027 done by Mergify.

Cherry-pick of 21cdd50 has failed:

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

You are currently cherry-picking commit 21cdd50377.
  (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:
	modified:   common/api/summary/ui-framework.exports.csv
	modified:   common/api/ui-framework.api.md
	new file:   common/changes/@bentley/presentation-components/update-immer_2021-03-24-15-39.json
	new file:   common/changes/@bentley/ui-components/update-immer_2021-03-24-15-39.json
	new file:   common/changes/@bentley/ui-framework/update-immer_2021-03-24-15-39.json
	new file:   common/changes/@bentley/ui-ninezone/update-immer_2021-03-24-15-39.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   common/config/rush/pnpm-lock.yaml
	both modified:   full-stack-tests/presentation/package.json
	both modified:   presentation/components/package.json
	both modified:   ui/components/package.json
	both modified:   ui/framework/package.json
	both modified:   ui/ninezone/package.json

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit 21cdd50)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
#	full-stack-tests/presentation/package.json
#	presentation/components/package.json
#	ui/components/package.json
#	ui/framework/package.json
#	ui/ninezone/package.json
@mergify mergify bot requested review from a team as code owners March 25, 2021 15:49
@mergify mergify bot added the conflicts label Mar 25, 2021
@mergify mergify bot mentioned this pull request Mar 25, 2021
@mergify mergify bot requested a review from a team as a code owner March 25, 2021 16:22
@roluk roluk enabled auto-merge (squash) March 26, 2021 15:27
@roluk roluk merged commit a67e616 into release/2.14.x Mar 26, 2021
@roluk roluk deleted the mergify/bp/release/2.14.x/pr-1027 branch March 26, 2021 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants