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 #1780 > support/v5.13] service client connection state handling #1784

Closed

Conversation

eclipse-ecal-bot
Copy link
Contributor

Cherry-pick failed

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

The following files have caused conflicts:

ecal/core/src/service/ecal_clientgate.cpp
ecal/core/src/service/ecal_clientgate.h
ecal/core/src/service/ecal_service_client_impl.cpp
ecal/core/src/service/ecal_service_client_impl.h

Resolving

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

git fetch origin
git checkout -b local/cherry-pick/fe2a857/support/v5.13 origin/support/v5.13
git branch -u origin/cherry-pick/fe2a857/support/v5.13
git cherry-pick f0d4fa94525785419b2a5cff9ff34531bf5b5c7c..fe2a8574af2657613e57067a1cf19c869f387967

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

git push -f origin HEAD:cherry-pick/fe2a857/support/v5.13

After resolving all conflicts, rebase-merge this PR.

@FlorianReimold
Copy link
Member

The merge conflicts are huge, just look at the scrollbars. Do we need this in 5.13?
grafik

@rex-schilasky
Copy link
Contributor

We do not need to merge this.

@FlorianReimold FlorianReimold deleted the cherry-pick/fe2a857/support/v5.13 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.

3 participants