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.

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

Add uint suffix (backport #4213) #4215

Closed
wants to merge 1 commit into from
Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 25, 2024

The space_nav repo uses slightly stricter compiler flags that causes the modified lines to result in a docker build failure:

https://github.com/space-ros/docker/actions/runs/8406248510/job/23019919497

Fixing this upstream allows up to stay current with upstream repos


This is an automatic backport of pull request #4213 done by Mergify.

(cherry picked from commit 46ff0ec)

# Conflicts:
#	nav2_graceful_controller/test/test_graceful_controller.cpp
Copy link
Contributor Author

mergify bot commented Mar 25, 2024

Cherry-pick of 46ff0ec has failed:

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

You are currently cherry-picking commit 46ff0ecc.
  (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 us:   nav2_graceful_controller/test/test_graceful_controller.cpp

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Mar 25, 2024
Copy link
Contributor Author

mergify bot commented Mar 25, 2024

@mergify[bot], all pull requests must be targeted towards the main development branch.
Once merged into main, it is possible to backport to @iron, but it must be in main
to have these changes reflected into new distributions.

@SteveMacenski SteveMacenski deleted the mergify/bp/iron/pr-4213 branch March 25, 2024 18:47
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.

2 participants