Skip to content

feat(runway): wire merge controller to Merger extension#366

Closed
kevinlnew wants to merge 2 commits into
mainfrom
kevin.new/runway-merge-ctrl
Closed

feat(runway): wire merge controller to Merger extension#366
kevinlnew wants to merge 2 commits into
mainfrom
kevin.new/runway-merge-ctrl

Conversation

@kevinlnew

@kevinlnew kevinlnew commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

Summary

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.

Test Plan

Issues

Stack

  1. @ feat(runway): wire merge controller to Merger extension #366
  2. refactor(runway): use "merge target" terminology consistently #367
  3. fix(consumer): derive controllerCtx from Background, not caller context #368

The merge-conflict-check controller was a parse-and-log stub. Wire it to
the Merger extension so it performs the dry-run check and publishes the
MergeResult to the merge-conflict-check-signal topic. A merge conflict is
an expected outcome (ack + publish FAILED), not an infrastructure error.
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

Copy link
Copy Markdown
Contributor Author

Closing; duplicate by accident with old branch.

@kevinlnew kevinlnew closed this Jul 14, 2026
@behinddwalls behinddwalls deleted the kevin.new/runway-merge-ctrl branch July 14, 2026 22:27
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.

1 participant