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

feat(client): add WithFromName to tx factory (backport #18852) #18853

Merged
merged 2 commits into from
Dec 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 21, 2023

This is an automatic backport of pull request #18852 done by Mergify.
Cherry-pick of 64dbee6 has failed:

On branch mergify/bp/release/v0.50.x/pr-18852
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 64dbee647.
  (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:   client/tx/factory.go

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

(cherry picked from commit 64dbee6)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner December 21, 2023 10:09
@mergify mergify bot added the conflicts label Dec 21, 2023
@atheeshp
Copy link
Contributor

atheeshp commented Dec 21, 2023

@gsai967 can you resolve conflicts here?

@julienrbrt
Copy link
Member

@gsai967 can you resolve conflicts here?

I don't think he has the commit rights, I can do it.

@atheeshp atheeshp enabled auto-merge (squash) December 21, 2023 10:17
@atheeshp atheeshp merged commit 0930b39 into release/v0.50.x Dec 21, 2023
43 of 45 checks passed
@atheeshp atheeshp deleted the mergify/bp/release/v0.50.x/pr-18852 branch December 21, 2023 10:24
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants