Skip to content
This repository has been archived by the owner on Aug 20, 2024. It is now read-only.

Fix CheckWidths error message for uninferred width (backport #2196) #2197

Merged
merged 2 commits into from
Apr 22, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 22, 2021

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

Cherry-pick of adc2ad9 has failed:

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

You are currently cherry-picking commit adc2ad9a.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/main/scala/firrtl/passes/CheckWidths.scala

no changes added to commit (use "git add" and/or "git commit -a")

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/

Looks like a typo/auto-merge hiccup.

(cherry picked from commit adc2ad9)

# Conflicts:
#	src/main/scala/firrtl/passes/CheckWidths.scala
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Apr 22, 2021
@mergify mergify bot merged commit 0484cfb into 1.3.x Apr 22, 2021
@mergify mergify bot deleted the mergify/bp/1.3.x/pr-2196 branch April 22, 2021 14:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Backport Automated backport, please consider for minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants