Skip to content

Commit

Permalink
Merge branch 'master' into reserve_example11
Browse files Browse the repository at this point in the history
  • Loading branch information
ARK3r committed Jan 26, 2024
2 parents c9c8c3a + 36aa372 commit 100ab3a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,20 @@ pull_request_rules:
- author=mergify[bot]
actions:
comment:
message: This pull request is in conflict. Could you fix it @bmagyar @dstogl @christophfroehlich?
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?

- name: development targets master branch
conditions:
- base!=master
- author!=bmagyar
- author!=dstogl
- author!=destogl
- author!=christophfroehlich
- author!=saikishor
- author!=mergify[bot]
- author!=dependabot[bot]
actions:
comment:
message: |
@{{author}}, all pull requests must be targeted towards the `master` development branch.
Once merged into `master`, it is possible to backport to @{{base}}, but it must be in `master`
Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
to have these changes reflected into new distributions.
2 changes: 1 addition & 1 deletion example_7/reference_generator/send_trajectory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ int main(int argc, char ** argv)
trajectory_point_msg.positions.data(), joint_positions.data.data(),
trajectory_point_msg.positions.size() * sizeof(double));
std::memcpy(
trajectory_point_msg.velocities.data(), joint_positions.data.data(),
trajectory_point_msg.velocities.data(), joint_velocities.data.data(),
trajectory_point_msg.velocities.size() * sizeof(double));

// integrate joint velocities
Expand Down

0 comments on commit 100ab3a

Please sign in to comment.