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 #1606 > support/v5.13] [core] send frequency calculation fixed in case of unconnected publisher #1607

Closed

Conversation

eclipse-ecal-bot
Copy link
Contributor

Cherry-pick failed

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

The following files have caused conflicts:

ecal/core/src/readwrite/ecal_writer.cpp

Resolving

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

git fetch origin
git checkout -b local/cherry-pick/526ef8a/support/v5.13 origin/support/v5.13
git branch -u origin/cherry-pick/526ef8a/support/v5.13
git cherry-pick 410aae069cfb383af295c51ddbf6999cf5544539..526ef8ac236198f801bbcb24296fb67aa883ff7b

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

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

After resolving all conflicts, rebase-merge this PR.

@KerstinKeller
Copy link
Contributor

Fixed with #1608.

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.

None yet

2 participants