Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 1, 2024

Like brew says, Warning: Formula pyqt5 was renamed to pyqt@5.


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

@mergify
Copy link
Contributor Author

mergify bot commented Apr 1, 2024

Cherry-pick of bd8e984 has failed:

On branch mergify/bp/iron/pr-4241
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit bd8e984e.
  (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:   source/Installation/Alternatives/macOS-Development-Setup.rst

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

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

@mergify mergify bot added the conflicts label Apr 1, 2024
@mergify mergify bot requested review from audrow and clalancette as code owners April 1, 2024 14:51
Signed-off-by: Corey Quinn <[email protected]>
(cherry picked from commit bd8e984)

# Conflicts:
#	source/Installation/Alternatives/macOS-Development-Setup.rst
@clalancette clalancette force-pushed the mergify/bp/iron/pr-4241 branch from 3650964 to 9e3c86b Compare April 1, 2024 14:53
@clalancette clalancette merged commit c07022b into iron Apr 1, 2024
@clalancette clalancette deleted the mergify/bp/iron/pr-4241 branch April 1, 2024 14:58
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.

2 participants