Skip to content

Conversation

@eclipse-ecal-bot
Copy link

Cherry-pick failed

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

The following files have caused conflicts:

lang/python/src/msg/ecal/msg/proto/helper.py

Resolving

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

git fetch origin
git checkout -b local/cherry-pick/47a57f0/support/v5.13 origin/support/v5.13
git branch -u origin/cherry-pick/47a57f0/support/v5.13
git cherry-pick 675d5313c5d42f4b87e5daf2e37ba7ebdde4f3e0..47a57f0ebca8d0ccf4a08c3e3e22c557aea17bb4

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

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

After resolving all conflicts, rebase-merge this PR.

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