feat(runway): wire merge controller to Merger extension#283
Open
kevinlnew wants to merge 1 commit into
Open
Conversation
kevinlnew
requested review from
a team,
behinddwalls and
sbalabanov
as code owners
sbalabanov
requested changes
Jun 30, 2026
| metrics.NamedCounter(c.metricsScope, opName, "merge_errors", 1) | ||
| return fmt.Errorf("failed to merge for %s: %w", request.GetId(), err) | ||
| } | ||
| if err != nil { |
Contributor
There was a problem hiding this comment.
could be merged with the previous nil check branch
| return fmt.Errorf("failed to publish merge result for %s: %w", request.GetId(), err) | ||
| } | ||
|
|
||
| c.logger.Infow("published merge result", |
kevinlnew
force-pushed
the
kevin.new/runway-merge-ctrl
branch
from
d46d3cc to
ef51e2f
Compare
kevinlnew
changed the base branch from
main
to
kevin.new/runway-merge-check-ctrl
2 tasks
The merge controller was a parse-and-log stub. Wire it to the Merger extension so it performs the committing merge and publishes the MergeResult (with produced revisions) to the merge-signal topic. Mirrors the merge-conflict-check controller pattern.
kevinlnew
force-pushed
the
kevin.new/runway-merge-ctrl
branch
from
ef51e2f to
04c860c
Compare
kevinlnew
force-pushed
the
kevin.new/runway-merge-check-ctrl
branch
from
86384e6 to
6cd393d
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
merger.Factoryextension so it performs the committing merge instead of just loggingMergeResult(with produced revisions) to themerge-signaltopic —SUCCEEDEDon clean merge,FAILEDonmerger.ErrConflictStacked on #280 — merge that first.
Test plan
bazel test //runway/controller/merge:merge_testpassesbazel build //example/runway/server:runwaybuilds cleanlymake gazelle && make fmt— in sync🤖 Generated with Claude Code