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

Fix compiler warning on Apple/M1/Clang (backport #1857) #1858

Merged
merged 1 commit into from
Aug 8, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 7, 2021

This is an automatic backport of pull request #1857 done by Mergify.
Cherry-pick of e667346 has failed:

On branch mergify/bp/0.27-maintenance/pr-1857
Your branch is up to date with 'origin/0.27-maintenance'.

You are currently cherry-picking commit e6673465.
  (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:   cmake/compilerFlags.cmake

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.io/

@clanmills clanmills merged commit 15e3fb7 into 0.27-maintenance Aug 8, 2021
@clanmills clanmills added this to the v0.27.5 milestone Aug 8, 2021
@mergify mergify bot deleted the mergify/bp/0.27-maintenance/pr-1857 branch August 8, 2021 09:10
@clanmills clanmills mentioned this pull request Aug 9, 2021
@clanmills clanmills mentioned this pull request Sep 29, 2021
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