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 #1777 > support/v5.12] [Readme.md] Updated supported operating systems #1783

Closed

Conversation

eclipse-ecal-bot
Copy link
Contributor

Cherry-pick failed

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

The following files have caused conflicts:

README.md

Resolving

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

git fetch origin
git checkout -b local/cherry-pick/f0d4fa9/support/v5.12 origin/support/v5.12
git branch -u origin/cherry-pick/f0d4fa9/support/v5.12
git cherry-pick ecb51790436bc874d8fcbe4f4b3ff996b3b133f2..f0d4fa94525785419b2a5cff9ff34531bf5b5c7c

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

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

After resolving all conflicts, rebase-merge this PR.

@FlorianReimold
Copy link
Member

not important enough to fix the merge conflicts

@FlorianReimold FlorianReimold deleted the cherry-pick/f0d4fa9/support/v5.12 branch November 14, 2024 12:37
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