Skip to content

Fix merge conflict in docstring#3441

Merged
bmagyar merged 1 commit into
jazzyfrom
fix-merge
Jul 13, 2026
Merged

Fix merge conflict in docstring#3441
bmagyar merged 1 commit into
jazzyfrom
fix-merge

Conversation

@christophfroehlich

Copy link
Copy Markdown
Member

Description

Fixes an issue merged with #3336

Is this user-facing behavior change?

no

Did you use Generative AI?

no

@codecov

codecov Bot commented Jul 2, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 89.45%. Comparing base (0194fdd) to head (5df898d).

Additional details and impacted files
@@           Coverage Diff           @@
##            jazzy    #3441   +/-   ##
=======================================
  Coverage   89.44%   89.45%           
=======================================
  Files         161      161           
  Lines       20567    20567           
  Branches     1630     1631    +1     
=======================================
+ Hits        18397    18398    +1     
- Misses       1500     1501    +1     
+ Partials      670      668    -2     
Flag Coverage Δ
unittests 89.45% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...interface/include/controller_interface/helpers.hpp 61.53% <ø> (ø)

... and 3 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@bmagyar

bmagyar commented Jul 13, 2026

Copy link
Copy Markdown
Member

thank you! I've noticed this too but forgot 🙈

@bmagyar bmagyar merged commit 6dbcd10 into jazzy Jul 13, 2026
14 of 15 checks passed
@bmagyar bmagyar deleted the fix-merge branch July 13, 2026 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants