Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2021

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

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

You are currently cherry-picking commit d27b83e.
  (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:   config/renesas_ra/dev_ros2_packages.txt
	new file:   config/renesas_ra/dev_uros_packages.repos
	new file:   config/renesas_ra/list_apps.sh
	new file:   config/renesas_ra/ra6m5/board.repos
	new file:   config/renesas_ra/ra6m5/build.sh
	new file:   config/renesas_ra/ra6m5/client_uros_packages.repos
	new file:   config/renesas_ra/ra6m5/configure.sh
	new file:   config/renesas_ra/ra6m5/create.sh
	new file:   config/renesas_ra/ra6m5/flash.sh
	modified:   scripts/create_firmware_ws.sh

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.io/

* Add renesas RA6M5

* Fix

* Avoid toolchain

(cherry picked from commit d27b83e)

# Conflicts:
#	README.md
@mergify mergify bot added the conflicts label Sep 20, 2021
@mergify mergify bot mentioned this pull request Sep 20, 2021
@pablogs9 pablogs9 merged commit 0eec818 into galactic Sep 20, 2021
@pablogs9 pablogs9 deleted the mergify/bp/galactic/pr-390 branch September 20, 2021 12:21
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