Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 13, 2023

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

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

You are currently cherry-picking commit fd9adb8.
  (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:   source/Releases/Release-Iron-Irwini.rst
	modified:   source/The-ROS2-Project/Contributing/Migration-Guide-Python.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Service-And-Client.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Py-Service-And-Client.rst
	modified:   source/Tutorials/Intermediate/Writing-an-Action-Server-Client/scripts/client_0.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   source/Tutorials/Advanced/FastDDS-Configuration.rst
	both modified:   source/Tutorials/Beginner-Client-Libraries/Custom-ROS2-Interfaces.rst

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

Signed-off-by: stevemacenski <[email protected]>
(cherry picked from commit fd9adb8)

# Conflicts:
#	source/Tutorials/Advanced/FastDDS-Configuration.rst
#	source/Tutorials/Beginner-Client-Libraries/Custom-ROS2-Interfaces.rst
@mergify mergify bot requested review from audrow and clalancette as code owners February 13, 2023 21:33
@mergify mergify bot added the conflicts label Feb 13, 2023
@clalancette clalancette deleted the mergify/bp/foxy/pr-3328 branch February 13, 2023 21:37
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.

3 participants