Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 24, 2022

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

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

You are currently cherry-picking commit c526967.
  (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:   _scripts/start-docker.sh
	new file:   doc/how_to_guides/how_to_setup_docker_containers_in_ubuntu.rst

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   doc/how_to_guides/how_to_guides.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

@mergify mergify bot added the conflicts label May 24, 2022
abake48 and others added 5 commits May 24, 2022 08:53
Co-authored-by: Jafar Abdi <cafer.abdi@gmail.com>
Co-authored-by: Jack <jack.center@picknik.ai>
(cherry picked from commit c526967)

# Conflicts:
#	doc/how_to_guides/how_to_guides.rst
@tylerjw tylerjw force-pushed the mergify/bp/foxy/pr-291 branch from 7d126bd to f6ee9c1 Compare May 24, 2022 14:54
@tylerjw tylerjw removed the conflicts label May 24, 2022
@tylerjw
Copy link
Member

tylerjw commented May 24, 2022

Closing as we decided to not backport this.

@tylerjw tylerjw closed this May 24, 2022
@mergify mergify bot deleted the mergify/bp/foxy/pr-291 branch May 24, 2022 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants