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

[JTC] Deprecate start_with_holding (backport #1076) #1086

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 21, 2024

It was decided not to remove start_with_holding in iron/humble, see #839 and #876.
So let's deprecate it.


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

(cherry picked from commit ea66755)

# Conflicts:
#	joint_trajectory_controller/src/joint_trajectory_controller.cpp
#	joint_trajectory_controller/src/joint_trajectory_controller_parameters.yaml
Copy link
Contributor Author

mergify bot commented Mar 21, 2024

Cherry-pick of ea66755 has failed:

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

You are currently cherry-picking commit ea66755.
  (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:   joint_trajectory_controller/src/joint_trajectory_controller.cpp
	both modified:   joint_trajectory_controller/src/joint_trajectory_controller_parameters.yaml

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

@christophfroehlich
Copy link
Contributor

#558 hasn't been backported to humble, so no need to deprecate things here.

@mergify mergify bot deleted the mergify/bp/humble/pr-1076 branch March 21, 2024 07:20
henrygerardmoore pushed a commit to henrygerardmoore/ros2_controllers that referenced this pull request Jul 19, 2024
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.

1 participant