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 #1650 > support/v5.13] [core] Fix bug in frequency calculator that will reset the frequency to 0.0 even though data is still incoming. #1652

Merged
merged 1 commit into from
Jul 16, 2024

Conversation

eclipse-ecal-bot
Copy link

Cherry-pick failed

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

The following files have caused conflicts:

testing/ecal/util_test/src/util_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/a58f6af/support/v5.13 origin/support/v5.13
git branch -u origin/cherry-pick/a58f6af/support/v5.13
git cherry-pick bd3bfc3481e5c3543f783d83d4ff70ea3b285a54..a58f6afa44e53ce3c5978bcea1b6fd5be9c9ef62

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

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

After resolving all conflicts, rebase-merge this PR.

@KerstinKeller KerstinKeller force-pushed the cherry-pick/a58f6af/support/v5.13 branch from a48895c to 945a0b3 Compare July 10, 2024 15:26
@KerstinKeller KerstinKeller marked this pull request as ready for review July 16, 2024 12:51
@KerstinKeller KerstinKeller merged commit d8a33ff into support/v5.13 Jul 16, 2024
10 of 11 checks passed
@KerstinKeller KerstinKeller deleted the cherry-pick/a58f6af/support/v5.13 branch July 17, 2024 13:05
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