Skip to content

[CP #2649 > support/v5.13] [ecalhdf5] comparing EntryInfo also takes SndClock into account such … - #2652

Draft
eclipse-ecal-bot wants to merge 1 commit into
support/v5.13from
cherry-pick/a922bd1/support/v5.13
Draft

[CP #2649 > support/v5.13] [ecalhdf5] comparing EntryInfo also takes SndClock into account such …#2652
eclipse-ecal-bot wants to merge 1 commit into
support/v5.13from
cherry-pick/a922bd1/support/v5.13

Conversation

@eclipse-ecal-bot

Copy link
Copy Markdown

Cherry-pick failed

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

The following files have caused conflicts:

tests/contrib/ecalhdf5/hdf5_test/src/hdf5_test.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/a922bd1/support/v5.13 origin/support/v5.13
git branch -u origin/cherry-pick/a922bd1/support/v5.13
git cherry-pick 0bef16678c567b153d8c98a77eca4ac3581f6525..a922bd1a6df6bda6cacd017854aa15d7199aac38

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

git push -f origin HEAD:cherry-pick/a922bd1/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.

1 participant