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 macOS-Development-Setup.rst (backport #3758) #3769

Merged
merged 1 commit into from
Jun 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 30, 2023

This is an automatic backport of pull request #3758 done by Mergify.
Cherry-pick of 15260f5 has failed:

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

You are currently cherry-picking commit 15260f5.
  (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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

@mergify mergify bot added the conflicts label Jun 30, 2023
- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
(cherry picked from commit 15260f5)

# Conflicts:
#	source/Installation/Alternatives/macOS-Development-Setup.rst
@clalancette clalancette merged commit 11ae66c into humble Jun 30, 2023
5 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-3758 branch June 30, 2023 17:21
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