Skip to content

Enable StaticTransformBroadcaster in Intra-process enabled components (backport #607)#612

Merged
clalancette merged 2 commits intohumblefrom
mergify/bp/humble/pr-607
Jul 10, 2023
Merged

Enable StaticTransformBroadcaster in Intra-process enabled components (backport #607)#612
clalancette merged 2 commits intohumblefrom
mergify/bp/humble/pr-607

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 23, 2023

This is an automatic backport of pull request #607 done by Mergify.
Cherry-pick of edad1bc has failed:

On branch mergify/bp/humble/pr-607
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit edad1bcc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   tf2_ros/test/test_static_transform_broadcaster.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tf2_ros/include/tf2_ros/static_transform_broadcaster.h

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@roncapat @mergify
Enable StaticTransformBroadcaster in Intra-process enabled components (…
7721b88 
…#607)

* Update static_transform_broadcaster.h

(cherry picked from commit edad1bc)

# Conflicts:
#	tf2_ros/include/tf2_ros/static_transform_broadcaster.h
@mergify mergify bot added the conflicts label Jun 23, 2023
@mergify mergify bot mentioned this pull request Jun 23, 2023
Merged
@ahcorde
Fixed mergify
c50a042 
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@roncapat roncapat mentioned this pull request Jun 30, 2023
Merged
@roncapat
Copy link
Copy Markdown
Contributor

roncapat commented Jul 7, 2023

May I remind you to merge this one if possible? :)

@ahcorde
Copy link
Copy Markdown
Contributor

ahcorde commented Jul 7, 2023 •
edited by clalancette
Loading

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@clalancette clalancette merged commit 936a352 into humble Jul 10, 2023
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-607 branch July 10, 2023 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ahcorde ahcorde ahcorde approved these changes

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@roncapat @ahcorde @clalancette