UniversalRobots / Universal_Robots_ROS2_Gazebo_Simulation

BSD 3-Clause "New" or "Revised" License
54 stars 24 forks source link

Add UR30 as a new option to launch things (backport #47) #54

Closed mergify[bot] closed 3 months ago

mergify[bot] commented 4 months ago

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

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

You are currently cherry-picking commit e5a8c85.
  (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:   ur_simulation_gazebo/launch/ur_sim_control.launch.py
    both modified:   ur_simulation_gazebo/launch/ur_sim_moveit.launch.py

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](https://docs.mergify.com/). 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 ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com
VinDp commented 4 months ago

Related to #128 and #930