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: tools (backport #35) #36

Merged
merged 3 commits into from
Sep 7, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 1, 2023

This is an automatic backport of pull request #35 done by Mergify.
Cherry-pick of 533bb03 has failed:

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

You are currently cherry-picking commit 533bb03.
  (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:   .gitignore
	modified:   Makefile
	new file:   tools/tools.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   go.work.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

* modity tools

* run go mod tidy

---------

Co-authored-by: aljo242 <[email protected]>
(cherry picked from commit 533bb03)

# Conflicts:
#	go.mod
#	go.sum
#	go.work.sum
@mergify mergify bot added the conflicts label Sep 1, 2023
@davidterpay davidterpay merged commit 62b3f37 into release/v1.x.x Sep 7, 2023
6 checks passed
@davidterpay davidterpay deleted the mergify/bp/release/v1.x.x/pr-35 branch September 7, 2023 15:27
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