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

chore: versioning maintenance (backport #738) #748

Merged
merged 3 commits into from
Apr 5, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 5, 2022

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

On branch mergify/bp/release/v2.x.x/pr-738
Your branch is up to date with 'origin/release/v2.x.x'.

You are currently cherry-picking commit ab7813b.
  (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:   .mergify.yml
	modified:   README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   price-feeder/CHANGELOG.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.com

* chore: versioning maintenance for the price feeder

* add 0.2.x price feeder branch backporting label

(cherry picked from commit ab7813b)

# Conflicts:
#	price-feeder/CHANGELOG.md
@mergify mergify bot requested review from a team as code owners April 5, 2022 14:52
@mergify mergify bot added the conflicts label Apr 5, 2022
price-feeder/CHANGELOG.md Outdated Show resolved Hide resolved
price-feeder/CHANGELOG.md Outdated Show resolved Hide resolved
@adamewozniak adamewozniak merged commit 5f4f0ef into release/v2.x.x Apr 5, 2022
@adamewozniak adamewozniak deleted the mergify/bp/release/v2.x.x/pr-738 branch April 5, 2022 15:11
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.

None yet

2 participants