Skip to content

refactor: improve rebase detection and add post-rebase workflow#65

Open
kostyay wants to merge 1 commit intomainfrom
refactor/rebase-workflow-improvements
Open

refactor: improve rebase detection and add post-rebase workflow#65
kostyay wants to merge 1 commit intomainfrom
refactor/rebase-workflow-improvements

Conversation

@kostyay
Copy link
Copy Markdown
Owner

@kostyay kostyay commented Mar 29, 2026

  • Extract CommandUI interface to decouple UI notifications from full CommandContext
  • Simplify default branch detection by looping over branch candidates instead of duplicate checks
  • Add --autostash flag to preserve uncommitted changes during rebase
  • Introduce showRebaseSummary() to display commit count and short log after successful rebase
  • Introduce offerForcePush() to safely prompt for force-push-with-lease after history rewrite
  • Expand conflict resolution guidance with safety protocol preventing dangerous operations (force push without lease, credential staging, config changes)
  • Improve code readability by collapsing single-statement if blocks

@kostyay kostyay changed the title WIP refactor: improve rebase detection and add post-rebase workflow Mar 29, 2026
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