Skip to content

[Bug]: Completing worktree features doesn't warn about or require merging unmerged branches #407

@Mharbulous

Description

@Mharbulous

Environment Information

  • Operating System: Windows 11
  • Node.js version: v24.4.1
  • Automaker version: 0.9

Steps to Reproduce

  1. Open Automaker and select a project
  2. Create a new feature with Work Mode set to "Auto Worktree"
  3. Move the feature to "In Progress" and let the agent execute
  4. Move the feature to "Verified" after reviewing
  5. Click "Complete" to archive the feature
  6. Check the .worktrees/ folder and run git branch in the project

Expected Behavior

One of the following:

  • A warning should appear when completing a feature that has an unmerged worktree branch
  • The "Complete" action should offer to merge the worktree first
  • The UI should prevent completing without merging, or clearly indicate the branch remains unmerged

Actual Behavior

  • The feature is archived to the "Completed Features" modal with no warning
  • The worktree folder remains in .worktrees/
  • The feature branch remains unmerged in git
  • There is no visual indicator that completed features have unmerged changes
  • Users may believe their work is integrated into main when it is not

Additional Context

The "Complete" and "Merge" actions are entirely separate operations with no enforcement or warning connecting them. This can lead to:

  • Orphaned worktrees accumulating on disk
  • Unmerged feature branches cluttering the repository
  • Lost work if users assume completing means merging

Alternatives Considered:

  • Relying on users to manually merge before completing (current behavior) - insufficient because the UI doesn't make this requirement clear
  • Automatic merge on complete - may be too aggressive if users want to review first

Suggested Solution:
Show a confirmation dialog when completing a worktree feature: "This feature has an unmerged branch. Would you like to merge it before completing?" with options to Merge & Complete, Complete Without Merging, or Cancel.

Metadata

Metadata

Assignees

No one assigned

    Labels

    EnhancementImprovements to existing functionality or UI.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions