Skip to content

[JTC] Reject messages with effort fields (#699) (backport #719)#730

Closed
mergify[bot] wants to merge 2 commits intohumblefrom
mergify/bp/humble/pr-719
Closed

[JTC] Reject messages with effort fields (#699) (backport #719)#730
mergify[bot] wants to merge 2 commits intohumblefrom
mergify/bp/humble/pr-719

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Aug 3, 2023

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

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

You are currently cherry-picking commit a572381.
  (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:   joint_trajectory_controller/src/joint_trajectory_controller.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   joint_trajectory_controller/test/test_trajectory_controller.cpp

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

@bmagyar @mergify
[JTC] Reject messages with effort fields (#699) (#719)
17e14e3 
Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
(cherry picked from commit a572381)

# Conflicts:
#	joint_trajectory_controller/test/test_trajectory_controller.cpp
@mergify mergify bot added the conflicts label Aug 3, 2023
@christophfroehlich
Copy link
Copy Markdown
Member

christophfroehlich commented Aug 3, 2023

needs probably #706

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Aug 5, 2023

This pull request is in conflict. Could you fix it @mergify[bot]?

@bmagyar
Copy link
Copy Markdown
Member

bmagyar commented Aug 5, 2023

@Mergifyio rebase humble

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Aug 5, 2023

rebase humble

❌ Base branch update has failed

Details

Git reported the following error:

Rebasing (1/1)
Auto-merging joint_trajectory_controller/src/joint_trajectory_controller.cpp
Auto-merging joint_trajectory_controller/test/test_trajectory_controller.cpp
CONFLICT (content): Merge conflict in joint_trajectory_controller/test/test_trajectory_controller.cpp
error: could not apply 17e14e3... [JTC] Reject messages with effort fields (#699) (#719)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 17e14e3... [JTC] Reject messages with effort fields (#699) (#719)

err-code: 79A8F

@christophfroehlich
Copy link
Copy Markdown
Member

christophfroehlich commented Aug 5, 2023

@Mergifyio rebase humble

I think rebase does not cherrypick the original backport onto master but the already-in-conflict-state of thi PR. I'll make a new PR fixing this ;)

@christophfroehlich christophfroehlich mentioned this pull request Aug 5, 2023
Merged
@christophfroehlich @mergify
[backport] Fix #730 (#736)
6adb847 
* Fix file name for include guard (backport #681)

(cherry picked from commit c619aac)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>

* Activate AdmittanceControllerTestParameterizedInvalidParameters (#711) (#733)

* [JTC] Re-enabling test, bugfixing and hardening. Adding a parameter to define when trajectories with non-zero velocity at the end are used. (backport #705) (#706)

* Enable effort rejection test

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@christophfroehlich
Copy link
Copy Markdown
Member

christophfroehlich commented Aug 7, 2023

closing in favor of #738

@mergify mergify bot deleted the mergify/bp/humble/pr-719 branch August 7, 2023 05:00
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.

2 participants

@christophfroehlich @bmagyar