Merge

wit merge <branch> [options]

# Merge a branch
wit merge feature-branch

# Merge without auto-commit
wit merge feature-branch --no-commit

# Ensure you're on the target branch
wit switch main

# Merge the feature branch
wit merge feature-login

Merging feature-login into main...
Merge successful!

wit merge feature-branch

Merging feature-branch into main...
CONFLICT: src/index.ts
CONFLICT: src/config.ts

Automatic merge failed. Fix conflicts and run:
  wit merge --continue

wit merge --conflicts

Conflicting files:
  1. src/index.ts (3 conflicts)
  2. src/config.ts (1 conflict)

{
  "file": "src/index.ts",
  "conflicts": [
    {
      "line": 15,
      "ours": "const timeout = 5000;",
      "theirs": "const timeout = 10000;",
      "base": "const timeout = 3000;"
    }
  ]
}

wit merge --abort

wit web

# 1. Start on main branch
wit switch main

# 2. Attempt merge
wit merge feature-auth

# 3. If conflicts occur, view them
wit merge --conflicts

# 4. Open and edit conflicting files
# (or use wit web for visual resolution)

# 5. Mark files as resolved
wit merge --resolve src/auth.ts
wit merge --resolve src/config.ts

# 6. Complete the merge
wit merge --continue

# 7. Verify the merge
wit log --oneline -n 5

wit undo