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.

Sign up for GitHub

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

Jump to bottom

[CP #1598 > support/v5.12] [Rec] Fixed "Recording" display bug and some other bugs #1600

Merged
merged 1 commit into from
May 17, 2024
Merged

[CP #1598 > support/v5.12] [Rec] Fixed "Recording" display bug and some other bugs #1600

merged 1 commit into from
May 17, 2024
+28 −28

Conversation

eclipse-ecal-bot
Copy link
Contributor

Cherry-pick failed

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

The following files have caused conflicts:

app/rec/rec_gui/src/widgets/recording_history_widget/job_history_model.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/3f97b09/support/v5.12 origin/support/v5.12
git branch -u origin/cherry-pick/3f97b09/support/v5.12
git cherry-pick a476840a9e19037e8e5981a81828ea75142043dd..3f97b091e5ce87beb94217f5ddcfe8d7fdace7c8

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

git push -f origin HEAD:cherry-pick/3f97b09/support/v5.12

After resolving all conflicts, rebase-merge this PR.

@FlorianReimold FlorianReimold force-pushed the cherry-pick/3f97b09/support/v5.12 branch from 3bbd656 to 0933803 Compare May 17, 2024 05:40
@FlorianReimold FlorianReimold force-pushed the cherry-pick/3f97b09/support/v5.12 branch from 0933803 to 7654adc Compare May 17, 2024 05:48
@FlorianReimold
[Rec] Fixed "Recording" display bug and some other bugs (#1598)
3cb472f 
The bugs were caused from changing bit-wise | and & to boolean versions, which caused the latter functions to not be evaluated. Turning around the parameter fixes the issue too, without bit-wise operators (those are prone to warnings)
@FlorianReimold FlorianReimold added the Auto Approve Request Automatic PR Approval label May 17, 2024
@FlorianReimold FlorianReimold marked this pull request as ready for review May 17, 2024 07:40
@FlorianReimold FlorianReimold merged commit 48683ca into support/v5.12 May 17, 2024
20 of 24 checks passed
@FlorianReimold FlorianReimold deleted the cherry-pick/3f97b09/support/v5.12 branch May 17, 2024 07:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] approved these changes

Assignees
No one assigned
Labels
Auto Approve Request Automatic PR Approval Auto cherry-pick failure ⚠️
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@eclipse-ecal-bot @FlorianReimold