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

Docs: Use branch name substitution for all links (backport #618) #633

Merged
merged 3 commits into from Jun 5, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 30, 2023

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

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

You are currently cherry-picking commit aece974.
  (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:   admittance_controller/doc/userdoc.rst
	modified:   diff_drive_controller/doc/userdoc.rst
	modified:   doc/controllers_index.rst
	modified:   doc/writing_new_controller.rst
	modified:   effort_controllers/doc/userdoc.rst
	modified:   force_torque_sensor_broadcaster/doc/userdoc.rst
	modified:   forward_command_controller/doc/userdoc.rst
	modified:   imu_sensor_broadcaster/doc/userdoc.rst
	modified:   joint_state_broadcaster/doc/userdoc.rst
	modified:   position_controllers/doc/userdoc.rst
	modified:   tricycle_controller/doc/userdoc.rst
	modified:   velocity_controllers/doc/userdoc.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   joint_trajectory_controller/doc/userdoc.rst

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

(cherry picked from commit aece974)

# Conflicts:
#	joint_trajectory_controller/doc/userdoc.rst
@christophfroehlich
Copy link
Contributor

christophfroehlich commented May 31, 2023

Let's backport #634 first, then let mergifyio rebase this: @Mergifyio rebase

@destogl
Copy link
Member

destogl commented May 31, 2023

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented May 31, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging joint_trajectory_controller/doc/userdoc.rst
CONFLICT (content): Merge conflict in joint_trajectory_controller/doc/userdoc.rst
error: could not apply 3a2f34e... Use branch name substitution for all links (#618)
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 3a2f34e... Use branch name substitution for all links (#618)

err-code: 2F4C9

@mergify
Copy link
Contributor Author

mergify bot commented May 31, 2023

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

@destogl
Copy link
Member

destogl commented May 31, 2023

@christophfroehlich is this OK?

@christophfroehlich
Copy link
Contributor

@christophfroehlich is this OK?

-> #638

@christophfroehlich
Copy link
Contributor

now its fine!

@destogl destogl merged commit f90c05b into humble Jun 5, 2023
11 of 12 checks passed
@destogl destogl deleted the mergify/bp/humble/pr-618 branch June 5, 2023 16:32
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.

None yet

2 participants