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 some README links to chipsalliance (bp #1673) #1680

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 24, 2020

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

Cherry-pick of e11d8b8 has failed:

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

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

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

	both modified:   README.md

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/

(cherry picked from commit e11d8b8)

# Conflicts:
#	README.md
@mergify mergify bot added the bp-conflict label Nov 24, 2020
@jackkoenig
Copy link
Contributor

I'm not sure why I backported this, probably no point.

@jackkoenig jackkoenig closed this Nov 24, 2020
@mergify mergify bot added the Backport Automated backport, please consider for minor release label Nov 24, 2020
@mergify mergify bot deleted the mergify/bp/3.3.x/pr-1673 branch November 24, 2020 02:25
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 bp-conflict
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant