Stacked Diffs

wit stack <command> [options]

wit stack create <name> [-d <description>]

# Create a new stack
wit stack create auth-feature

# With description
wit stack create auth-feature -d "User authentication system"

✓ Created stack 'auth-feature'
  Base branch: main
  Description: User authentication system

Next steps:
  wit stack push     # Create first branch in stack
  wit commit -m "..."  # Make your changes
  wit stack push     # Create next branch

wit stack push [branch-name]

wit stack push
# Creates: auth-feature/part-1

wit stack push login-form
# Creates: auth-feature/login-form

wit stack pop

wit stack list

Stacks:

* auth-feature (current)
    Base: main
    Branches: 3
    Add user authentication system

  backend-refactor
    Base: main
    Branches: 2

wit stack show [stack-name]

Stack: auth-feature

● auth-feature/part-3 ✓
  a1b2c3d Add session management

  │
● auth-feature/part-2 ↑2
  d4e5f6g Add login form

  │
● auth-feature/part-1 ✓ (current)
  h7i8j9k Add user model

Legend: ✓ synced | ↓ behind | ↑ ahead | ✗ diverged

wit stack sync

Syncing stack...

✓ Stack synced successfully

Rebased branches:
  ✓ auth-feature/part-1
  ✓ auth-feature/part-2
  ✓ auth-feature/part-3

✗ Sync failed
  Conflicts in auth-feature/part-2

Conflicts in:
  auth-feature/part-2
    - src/auth/login.ts
    - src/auth/session.ts

Resolve conflicts and run:
  wit rebase --continue
  wit stack sync

wit stack submit [--force]

# Push all branches
wit stack submit

# Force push (use with caution)
wit stack submit --force

wit stack delete <name>

wit stack up

wit stack down

wit stack goto <branch|index>

# By index (1-based)
wit stack goto 2

# By branch name
wit stack goto auth-feature/login-form

wit stack reorder <branch1> <branch2> ...

wit stack reorder auth-feature/part-2 auth-feature/part-1 auth-feature/part-3

# 1. Start on main
wit switch main
wit pull

# 2. Create a new stack for your feature
wit stack create user-settings

# 3. Create first branch and implement database schema
wit stack push db-schema
# ... make changes ...
wit add .
wit commit -m "Add user settings table"

# 4. Create second branch for the API
wit stack push api-endpoints
# ... make changes ...
wit add .
wit commit -m "Add settings API endpoints"

# 5. Create third branch for the UI
wit stack push ui-components
# ... make changes ...
wit add .
wit commit -m "Add settings UI"

# 6. View your stack
wit stack show

# 7. Push all branches for review
wit stack submit

# 8. Create PRs (each targets the previous branch)
wit pr create -t "Add user settings schema"
wit stack up
wit pr create -t "Add settings API" -b user-settings/db-schema
wit stack up
wit pr create -t "Add settings UI" -b user-settings/api-endpoints

# 9. When main updates, sync the stack
wit stack sync

# 10. As PRs are approved and merged, the stack shrinks
# When db-schema merges to main:
wit stack sync  # Rebases remaining branches onto main

# 11. Clean up when done
wit stack delete user-settings

wit stack push add-user-model      # ✓ Good
wit stack push part-1              # ✗ Not descriptive