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

[CP #1827 > support/v5.12] [GH Actions] Removed macOS packing step #1829

Merged
merged 1 commit into from
Nov 28, 2024

Conversation

eclipse-ecal-bot
Copy link
Contributor

Cherry-pick failed

Cherry-picked PR #1827 to branch support/v5.12.
The cherry-pick has failed.

The following files have caused conflicts:

.github/workflows/build-macos.yml

Resolving

Please resolve conflicts manually. You can use this PR and branch to your convenience.

git fetch origin
git checkout -b local/cherry-pick/04a546b/support/v5.12 origin/support/v5.12
git branch -u origin/cherry-pick/04a546b/support/v5.12
git cherry-pick 99c8a25ec541b03d73caa6d07a275ccb7dd855a5..04a546b685263104a31fe223144c40974aec9b90

# Resolve conflicts and use
#     git cherry-pick --continue
# until all conflicts are resolved.

git push -f origin HEAD:cherry-pick/04a546b/support/v5.12

After resolving all conflicts, rebase-merge this PR.

@FlorianReimold FlorianReimold force-pushed the cherry-pick/04a546b/support/v5.12 branch from 0cb0636 to 0dc90be Compare November 28, 2024 13:51
@FlorianReimold FlorianReimold marked this pull request as ready for review November 28, 2024 13:51
@FlorianReimold FlorianReimold merged commit e917ba9 into support/v5.12 Nov 28, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants