Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 22, 2025

Changelist

Make slight change to governance message, this is not used yet so the change should be safe

Test Plan

Test cases

Author/Reviewer Checklist

  • If this PR has changes that result in a different app state given the same prior state and transaction list, manually add the state-breaking label.
  • If the PR has breaking postgres changes to the indexer add the indexer-postgres-breaking label.
  • If this PR isn't state-breaking but has changes that modify behavior in PrepareProposal or ProcessProposal, manually add the label proposal-breaking.
  • If this PR is one of many that implement a specific feature, manually label them all feature:[feature-name].
  • If you wish to for mergify-bot to automatically create a PR to backport your change to a release branch, manually add the label backport/[branch-name].
  • Manually add any of the following labels: refactor, chore, bug.

This is an automatic backport of pull request #3112 done by [Mergify](https://mergify.com).

(cherry picked from commit b901a3b)

# Conflicts:
#	indexer/packages/v4-protos/src/codegen/dydxprotocol/affiliates/affiliates.ts
#	proto/dydxprotocol/affiliates/affiliates.proto
#	protocol/x/affiliates/keeper/keeper_test.go
#	protocol/x/affiliates/types/affiliates.pb.go
#	protocol/x/affiliates/types/constants.go
@mergify mergify bot requested a review from a team as a code owner October 22, 2025 19:35
@mergify mergify bot added the conflicts label Oct 22, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Oct 22, 2025

Cherry-pick of b901a3b has failed:

On branch mergify/bp/release/protocol/v9.x/pr-3112
Your branch is up to date with 'origin/release/protocol/v9.x'.

You are currently cherry-picking commit b901a3bb.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   indexer/packages/v4-protos/src/codegen/dydxprotocol/affiliates/affiliates.ts
	both modified:   proto/dydxprotocol/affiliates/affiliates.proto
	both modified:   protocol/x/affiliates/keeper/keeper_test.go
	both modified:   protocol/x/affiliates/types/affiliates.pb.go
	both modified:   protocol/x/affiliates/types/constants.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Oct 22, 2025

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Comment @coderabbitai help to get the list of available commands and usage tips.

@jusbar23 jusbar23 closed this Oct 22, 2025
@jusbar23 jusbar23 deleted the mergify/bp/release/protocol/v9.x/pr-3112 branch October 22, 2025 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

2 participants