Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 15, 2022

This is an automatic backport of pull request #473 done by Mergify.
Cherry-pick of 3136ad0 has failed:

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

You are currently cherry-picking commit 3136ad0.
  (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/host/generic/build.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   config/host/generic/client_host_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

microxrcedds_c

(cherry picked from commit 3136ad0)

# Conflicts:
#	config/host/generic/client_host_packages.repos
Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
@pablogs9
Copy link
Member

CI errors not related merging

@pablogs9 pablogs9 merged commit 066c544 into main Mar 15, 2022
@pablogs9 pablogs9 deleted the mergify/bp/main/pr-473 branch March 15, 2022 07:40
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.

3 participants