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

Support using switch without importing SwitchContext (bp #1595) #1597

Merged
merged 3 commits into from
Nov 11, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 22, 2020

This is an automated backport of pull request #1595 done by Mergify

Cherry-pick of 9c4f14f has failed:

On branch mergify/bp/3.3.x/pr-1595
Your branch is up to date with 'origin/3.3.x'.

You are currently cherry-picking commit 9c4f14fb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   src/main/scala/chisel3/util/Conditional.scala
	modified:   src/test/scala/chiselTests/SwitchSpec.scala

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by us:   docs/src/wiki-deprecated/cookbook.md

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 simulator.

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

(cherry picked from commit 9c4f14f)

# Conflicts:
#	docs/src/wiki-deprecated/cookbook.md
@mergify mergify bot requested a review from a team as a code owner September 22, 2020 02:35
@mergify mergify bot requested review from seldridge and removed request for a team September 22, 2020 02:35
@mergify mergify bot added bp-conflict Backport Automated backport, please consider for minor release labels Sep 22, 2020
@mergify mergify bot merged commit aae0ba9 into 3.3.x Nov 11, 2020
@mergify mergify bot deleted the mergify/bp/3.3.x/pr-1595 branch November 11, 2020 06:07
jackkoenig pushed a commit that referenced this pull request Feb 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Automated backport, please consider for minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant