Update an open PR with its target branch (u: merge or rebase) #118

New issue

deadstyle · 2026-10-10T07:21:10-05:00

deadstyle commented

2026-10-10 07:21:10 -05:00

Problem

PM: "we are missing the option to merge in or rebase the latest into an open MR/PR." When the target branch has moved on, there's no way to bring the PR up to date from lazyforge.

Acceptance criteria (PM, 2026-10-10)

u on an open PR (PR box, its details, ★ Renovate PR rows) opens a small dialog asking how to update it with the latest target branch: merge or rebase.
On GitHub the dialog offers merge only (its API has no rebase update).
Confirming updates the PR on the forge, shows the outcome in the status bar, and refreshes the PR so CI state reflects the new head.
A failure (conflict, no permission, already up to date) shows the forge's reason in the status bar.
u is only enabled where the user can push/merge to the repo, and appears in hints/help there.
design.md keymap table gains u.

Context

Forgejo/Gitea: POST /repos/{owner}/{repo}/pulls/{index}/update?style=merge|rebase (confirmed in git.bobparsons.dev swagger).
GitHub: PUT /repos/{owner}/{repo}/pulls/{n}/update-branch (merge only).
Needs a new Forge capability/action (engineering lead's call on shape) and a dialog modelled on the merge dialog in internal/ui.

Out of scope

Bulk update of marked PRs.

## Problem PM: "we are missing the option to merge in or rebase the latest into an open MR/PR." When the target branch has moved on, there's no way to bring the PR up to date from lazyforge. ## Acceptance criteria (PM, 2026-10-10) - `u` on an open PR (PR box, its details, ★ Renovate PR rows) opens a small dialog asking how to update it with the latest target branch: **merge** or **rebase**. - On GitHub the dialog offers merge only (its API has no rebase update). - Confirming updates the PR on the forge, shows the outcome in the status bar, and refreshes the PR so CI state reflects the new head. - A failure (conflict, no permission, already up to date) shows the forge's reason in the status bar. - `u` is only enabled where the user can push/merge to the repo, and appears in hints/help there. - design.md keymap table gains `u`. ## Context - Forgejo/Gitea: `POST /repos/{owner}/{repo}/pulls/{index}/update?style=merge|rebase` (confirmed in git.bobparsons.dev swagger). - GitHub: `PUT /repos/{owner}/{repo}/pulls/{n}/update-branch` (merge only). - Needs a new `Forge` capability/action (engineering lead's call on shape) and a dialog modelled on the merge dialog in `internal/ui`. ## Out of scope - Bulk update of marked PRs.

deadstyle added the

feature

opus

labels

2026-10-10 07:21:12 -05:00

deadstyle referenced this issue

2026-10-10 08:09:12 -05:00

feat: update an open PR with its target branch (u) #121

deadstyle referenced this issue from a commit

2026-10-10 08:09:14 -05:00

fix(ui): disable u when the forge advertises no update styles

deadstyle referenced this issue from a commit