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

Prevent a possible segmentation fault (#4141) (backport #4147) #4151

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 27, 2024

This is an automatic backport of pull request #4147 done by Mergify.
Cherry-pick of 654e7e0 has failed:

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

You are currently cherry-picking commit 654e7e0d.
  (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 <file>..." to mark resolution)
	both modified:   nav2_smac_planner/src/analytic_expansion.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 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

* Prevent a possible segmentation fault

#4141
Signed-off-by: Joni Pöllänen <[email protected]>

* Cleanup

Signed-off-by: Joni Pöllänen <[email protected]>

---------

Signed-off-by: Joni Pöllänen <[email protected]>
(cherry picked from commit 654e7e0)

# Conflicts:
#	nav2_smac_planner/src/analytic_expansion.cpp
Copy link
Contributor Author

mergify bot commented Feb 27, 2024

Cherry-pick of 654e7e0 has failed:

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

You are currently cherry-picking commit 654e7e0d.
  (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 <file>..." to mark resolution)
	both modified:   nav2_smac_planner/src/analytic_expansion.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 Feb 27, 2024
Copy link
Contributor Author

mergify bot commented Feb 27, 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-4147 branch February 27, 2024 21:18
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