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

Fix sphinx for steering odometry library/controllers (backport #626) #636

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 31, 2023

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

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

You are currently cherry-picking commit a3f2a16.
  (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:   doc/controllers_index.rst

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ackermann_steering_controller/doc/userdoc.rst
	deleted by us:   bicycle_steering_controller/doc/userdoc.rst
	deleted by us:   steering_controllers_library/doc/userdoc.rst
	deleted by us:   tricycle_steering_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 a3f2a16)

# Conflicts:
#	ackermann_steering_controller/doc/userdoc.rst
#	bicycle_steering_controller/doc/userdoc.rst
#	steering_controllers_library/doc/userdoc.rst
#	tricycle_steering_controller/doc/userdoc.rst
@christophfroehlich
Copy link
Contributor

this will need #624 first

@mergify
Copy link
Contributor Author

mergify bot commented Jun 1, 2023

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

@christophfroehlich
Copy link
Contributor

@Mergifyio rebase
would be necessary

@mergify
Copy link
Contributor Author

mergify bot commented Jun 1, 2023

rebase

❌ Command disallowed due to command restrictions in the Mergify configuration.

  • any of:
    • sender-permission>=write
    • sender={{author}}

@destogl
Copy link
Member

destogl commented Jun 11, 2023

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jun 11, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging ackermann_steering_controller/doc/userdoc.rst
CONFLICT (add/add): Merge conflict in ackermann_steering_controller/doc/userdoc.rst
Auto-merging bicycle_steering_controller/doc/userdoc.rst
CONFLICT (add/add): Merge conflict in bicycle_steering_controller/doc/userdoc.rst
Auto-merging doc/controllers_index.rst
Auto-merging steering_controllers_library/doc/userdoc.rst
CONFLICT (add/add): Merge conflict in steering_controllers_library/doc/userdoc.rst
error: could not apply b40037d... Fix sphinx for steering odometry library/controllers (#626)
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 b40037d... Fix sphinx for steering odometry library/controllers (#626)

err-code: EEA12

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.

2 participants