Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 2, 2021

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

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

You are currently cherry-picking commit e13e64d.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")

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/

* Update standalone build tools section

* Upd

* Updates

(cherry picked from commit e13e64d)

# Conflicts:
#	README.md
@pablogs9 pablogs9 merged commit 0391470 into galactic Sep 2, 2021
@pablogs9 pablogs9 deleted the mergify/bp/galactic/pr-380 branch September 2, 2021 07:00
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