Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 19, 2021

This is an automatic backport of pull request #19298 done by Mergify.
Cherry-pick of 7d135f1 has failed:

On branch mergify/bp/v1.7/pr-19298
Your branch is up to date with 'origin/v1.7'.

You are currently cherry-picking commit 7d135f185.
  (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:   multinode-demo/bootstrap-validator.sh
	modified:   multinode-demo/validator.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   net/net.sh

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/

(cherry picked from commit 7d135f1)

# Conflicts:
#	net/net.sh
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Aug 19, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Aug 19, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 19, 2021
@mergify mergify bot merged commit 80a6479 into v1.7 Aug 19, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-19298 branch August 19, 2021 06:37
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants