Skip to content

feat: add reset to origin for diverged branches#799

Merged
matt2e merged 2 commits into
mainfrom
add-reset-to-remote
Jun 18, 2026
Merged

feat: add reset to origin for diverged branches#799
matt2e merged 2 commits into
mainfrom
add-reset-to-remote

Conversation

@matt2e

@matt2e matt2e commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

Summary

  • add a Reset to Origin action for diverged branches with destructive confirmation
  • hard-reset and clean local/workspace branches only after verifying origin state
  • update timeline row controls and cover reset eligibility with backend tests

@matt2e matt2e requested review from baxen and wesbillman as code owners June 18, 2026 05:55
matt2e added 2 commits June 18, 2026 16:34
Signed-off-by: Matt Toohey <contact@matttoohey.com>
Remove the diverged-origin rebase action and show Reset to Origin before Force Push so the recovery path is explicit.

Signed-off-by: Matt Toohey <contact@matttoohey.com>
@matt2e matt2e force-pushed the add-reset-to-remote branch from 2faab48 to a9367b0 Compare June 18, 2026 06:50
@matt2e matt2e merged commit ef48fec into main Jun 18, 2026
5 checks passed
@matt2e matt2e deleted the add-reset-to-remote branch June 18, 2026 06:58
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