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

Move installation instructions to subpage (backport #870) #884

Merged
merged 2 commits into from
Apr 16, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 16, 2023

This is an automatic backport of pull request #870 done by Mergify.
Cherry-pick of 202a70c has failed:

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

You are currently cherry-picking commit 202a70c.
  (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:
	new file:   ur_robot_driver/doc/installation/installation.rst
	modified:   ur_robot_driver/doc/installation/toc.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README.md

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

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Nov 16, 2023
* Move installation instructions to subpage

Apparently, having the build instructions so prominent on the main page
seems to motivate people to build from source instead of installing the
binary packages. This change simplifies the main repo page in order to
show how to install and quickstart directly, linking to the full instructions
from our sphinx doc.

* More explicit copy_paste example

This example should be ready-to-go when using the URSim example.

(cherry picked from commit 202a70c)

# Conflicts:
#	README.md
Copy link
Collaborator

@fmauch fmauch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should now be conflict-free and include #808

@fmauch fmauch merged commit 1e48ae3 into humble Apr 16, 2024
6 checks passed
@fmauch fmauch deleted the mergify/bp/humble/pr-870 branch April 16, 2024 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
humble Relevant for humble and higher ROS versions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant