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

[galactic-fix] fix typo in compiling description file. (backport #460) #467

Merged
merged 2 commits into from
Mar 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 4, 2022

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

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

You are currently cherry-picking commit a0725c9.
  (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:   config/freertos/nucleo_f767zi/client-colcon.meta

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   config/client_uros_packages.repos

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

fix repeated flag in client-colcon.meta

(cherry picked from commit a0725c9)

# Conflicts:
#	config/client_uros_packages.repos
Copy link
Member

@pablogs9 pablogs9 left a comment

Choose a reason for hiding this comment

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

Not related, we can merge

@pablogs9 pablogs9 merged commit 7a5d382 into main Mar 8, 2022
@pablogs9 pablogs9 deleted the mergify/bp/main/pr-460 branch March 8, 2022 06:57
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.

3 participants