8000 Fix deprecated RCLCPP folder (backport #66) by mergify[bot] · Pull Request #67 · micro-ROS/micro-ROS-demos · GitHub
[go: up one dir, main page]
Skip to content

Fix deprecated RCLCPP folder (backport #66) #67

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
Merged
pablogs9 merged 2 commits into from
May 26, 2022
Merged

Fix deprecated RCLCPP folder (backport #66) #67

pablogs9 merged 2 commits into from
May 26, 2022

Conversation

@mergify
Copy link
Contributor
@mergify mergify bot commented May 26, 2022

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

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

You are currently cherry-picking commit ca909e7.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: rclcpp/CHANGELOG.rst
	deleted by them: rclcpp/package.xml

no changes added to commit (use "git add" and/or "git commit -a")

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

@pablogs9 @mergify
Fix deprecated RCLCPP folder (#66)
815bc22 
Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit ca909e7)

# Conflicts:
#	rclcpp/CHANGELOG.rst
#	rclcpp/package.xml
@mergify mergify bot added the conflicts label May 26, 2022
@mergify mergify bot mentioned this pull request May 26, 2022
Merged
@pablogs9
Remove RCLCPP
828cfd2 
Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
@pablogs9 pablogs9 merged commit 45f342d into humble May 26, 2022
@pablogs9 pablogs9 deleted the mergify/bp/humble/pr-66 branch May 26, 2022 06:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@pablogs9
0