Skip to content

misc(go.mod): remove unused peg dependency (backport #2044)#2055

Merged
melekes merged 8 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-2044
Jan 17, 2024
Merged

misc(go.mod): remove unused peg dependency (backport #2044)#2055
melekes merged 8 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-2044

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 17, 2024

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

On branch mergify/bp/v0.38.x/pr-2044
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit fd741f5d9.
  (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:   codecov.yml
	modified:   tools/tools.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

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

Refs #523

(cherry picked from commit fd741f5)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner January 17, 2024 00:04
@mergify mergify bot added the conflicts label Jan 17, 2024
@melekes melekes merged commit e65a966 into v0.38.x Jan 17, 2024
@melekes melekes deleted the mergify/bp/v0.38.x/pr-2044 branch January 17, 2024 03:32
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.

1 participant