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 #1610 > support/v5.13] [c#] Do not reuse Protobuf message objects in callbacks #1614

Merged
merged 1 commit into from
May 28, 2024

Conversation

eclipse-ecal-bot
Copy link
Contributor

Cherry-pick failed

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

The following files have caused conflicts:

lang/csharp/Continental/eCAL/Protobuf/ProtoSubscriber.cs

Resolving

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

git fetch origin
git checkout -b local/cherry-pick/419a1d1/support/v5.13 origin/support/v5.13
git branch -u origin/cherry-pick/419a1d1/support/v5.13
git cherry-pick 0bdb60ceef2d0621791ae4950002df50e8430fe5..419a1d1a685866490d6125f6fcc4a95ea1bae0f9

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

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

After resolving all conflicts, rebase-merge this PR.

…ot reset fields which are not contained on the wire. (#1593) (#1610)
@KerstinKeller KerstinKeller marked this pull request as ready for review May 28, 2024 11:37
@KerstinKeller KerstinKeller merged commit 6f85a3a into support/v5.13 May 28, 2024
8 of 9 checks passed
@KerstinKeller KerstinKeller deleted the cherry-pick/419a1d1/support/v5.13 branch May 28, 2024 14:12
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