Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Replace merge conflict indicator with crossed swords symbol

Maximilian Roosf3b96a837527
diff --git a/CLAUDE.md b/CLAUDE.md
index 01a6b5ce6..bf0707492 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -78,7 +78,7 @@ Keep the first line of flag and argument descriptions brief—aim for 3-6 words.
**Good examples:**
- `/// Skip approval prompts`
-- `/// Show CI, conflicts, and full diffs`
+- `/// Show CI and line diffs`
- `/// Target branch (defaults to default branch)`
**Bad examples (too verbose):**
diff --git a/dev/config.example.toml b/dev/config.example.toml
index cc78ecc5f..5d0c55be2 100644
--- a/dev/config.example.toml
+++ b/dev/config.example.toml
@@ -46,7 +46,7 @@ worktree-path = "../{{ main_worktree }}.{{ branch }}"
# List Command Defaults
# Configure default behavior for `wt list`
[list]
-full = false # Show CI, conflicts, diffs by default
+full = false # Show CI and line diffs by default
branches = false # Include branches without worktrees by default
remotes = false # Include remote branches by default
diff --git a/docs/content/list.md b/docs/content/list.md
index 4fe2f0447..a6ad2ae1c 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -30,7 +30,7 @@ List all worktrees:
<!-- END AUTO-GENERATED -->
-Include CI status and conflict detection:
+Include CI status and line diffs:
<!-- ⚠️ AUTO-GENERATED from tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap — edit source to update -->
@@ -111,7 +111,7 @@ Symbols appear in the Status column in this order:
| | `✖` | Merge conflicts |
| | `↻` | Rebase in progress |
| | `⋈` | Merge in progress |
-| Branch state | `⚔` | Would conflict if merged to main (`--full` only) |
+| Branch state | `⚔` | Would conflict if merged to main |
| | `≡` | Matches main (identical contents) |
| | `_` | No commits ahead, clean working tree |
| Main divergence | `^` | Is the main branch |
@@ -190,7 +190,7 @@ Options:
Include remote branches
--full
- Show CI, conflicts, diffs
+ Show CI and line diffs
--progressive
Show fast info immediately, update with slow info
diff --git a/src/cli.rs b/src/cli.rs
index c06104d26..bdaea8b7e 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1361,7 +1361,7 @@ List all worktrees:
$ wt list
```
-Include CI status and conflict detection:
+Include CI status and line diffs:
<!-- wt list --full -->
```console
@@ -1422,7 +1422,7 @@ Symbols appear in the Status column in this order:
| | `✖` | Merge conflicts |
| | `↻` | Rebase in progress |
| | `⋈` | Merge in progress |
-| Branch state | `⚔` | Would conflict if merged to main (`--full` only) |
+| Branch state | `⚔` | Would conflict if merged to main |
| | `≡` | Matches main (identical contents) |
| | `_` | No commits ahead, clean working tree |
| Main divergence | `^` | Is the main branch |
@@ -1492,7 +1492,7 @@ wt list --format=json | jq '.[] | select(.status.main_divergence == "Ahead")'
#[arg(long)]
remotes: bool,
- /// Show CI, conflicts, diffs
+ /// Show CI and line diffs
#[arg(long)]
full: bool,
diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rs
index aa92d2c2e..7e37bed09 100644
--- a/src/commands/list/mod.rs
+++ b/src/commands/list/mod.rs
@@ -45,7 +45,7 @@
//! First run in a repo without cached default branch adds ~100-300ms for network lookup.
//!
//! After the skeleton appears, cells fill in progressively as git operations complete.
-//! The slowest operations (CI status, merge-tree conflict detection) only run with `--full`.
+//! The slowest operation (CI status) only runs with `--full`.
//!
//! ## Git Commands Per Worktree
//!
@@ -151,17 +151,13 @@ pub fn handle_list(
let repo = Repository::current();
// Build skip set based on flags
- // Without --full: skip expensive operations (BranchDiff, CiStatus, MergeTreeConflicts)
+ // Without --full: skip expensive operations (BranchDiff, CiStatus)
let skip_tasks: std::collections::HashSet<TaskKind> = if show_full {
std::collections::HashSet::new() // Compute everything
} else {
- [
- TaskKind::BranchDiff,
- TaskKind::CiStatus,
- TaskKind::MergeTreeConflicts,
- ]
- .into_iter()
- .collect()
+ [TaskKind::BranchDiff, TaskKind::CiStatus]
+ .into_iter()
+ .collect()
};
// Progressive rendering only for table format with Progressive mode
diff --git a/src/config/user.rs b/src/config/user.rs
index 1e5ba4cd8..4fe3966df 100644
--- a/src/config/user.rs
+++ b/src/config/user.rs
@@ -224,7 +224,7 @@ pub struct UserProjectConfig {
/// Configuration for the `wt list` command
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
pub struct ListConfig {
- /// Show CI, conflicts, and diffs by default
+ /// Show CI and line diffs by default
#[serde(skip_serializing_if = "Option::is_none")]
pub full: Option<bool>,
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
index 5257a1453..d38da8f7d 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
@@ -90,7 +90,7 @@ Creates ~/.config/worktrunk/config.toml with the following content:
# List Command Defaults
# Configure default behavior for `wt list`
[list]
- full = false # Show CI, conflicts, diffs by default
+ full = false # Show CI and line diffs by default
branches = false # Include branches without worktrees by default
remotes = false # Include remote branches by default

diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
index ab58306c9..87dcd4081 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -37,7 +37,7 @@ Usage: wt list [OPTIONS]
Include remote branches
--full
- Show CI, conflicts, diffs
+ Show CI and line diffs
--progressive
Show fast info immediately, update with slow info
@@ -67,7 +67,7 @@ List all worktrees:
$ wt list
-Include CI status and conflict detection:
+Include CI status and line diffs:
$ wt list --full
@@ -112,29 +112,29 @@ CI is only checked for branches that track a remote — local-only branches show
Symbols appear in the Status column in this order:
- Category Symbol Meaning
- ───────────────── ────── ──────────────────────────────────────────────
- Working tree + Staged files
- ! Modified files (unstaged)
- ? Untracked files
- ✖ Merge conflicts
- ↻ Rebase in progress
- ⋈ Merge in progress
- Branch state ⚔ Would conflict if merged to main (--full only)
- ≡ Matches main (identical contents)
- _ No commits ahead, clean working tree
- Main divergence ^ Is the main branch
- ↑ Ahead of main
- ↓ Behind main
- ↕ Diverged from main
- Remote divergence | In sync with remote
- ⇡ Ahead of remote
- ⇣ Behind remote
- ⇅ Diverged from remote
- Worktree state / Branch without worktree
- ⚑ Path doesn't match template
- ⌫ Prunable (directory missing)
- ⊠ Locked worktree
+ Category Symbol Meaning
+ ───────────────── ────── ────────────────────────────────────
+ Working tree + Staged files
+ ! Modified files (unstaged)
+ ? Untracked files
+ ✖ Merge conflicts
+ ↻ Rebase in progress
+ ⋈ Merge in progress
+ Branch state ⚔ Would conflict if merged to main
+ ≡ Matches main (identical contents)
+ _ No commits ahead, clean working tree
+ Main divergence ^ Is the main branch
+ ↑ Ahead of main
+ ↓ Behind main
+ ↕ Diverged from main
+ Remote divergence | In sync with remote
+ ⇡ Ahead of remote
+ ⇣ Behind remote
+ ⇅ Diverged from remote
+ Worktree state / Branch without worktree
+ ⚑ Path doesn't match template
+ ⌫ Prunable (directory missing)
+ ⊠ Locked worktree
Rows are dimmed when the branch content is already in main (≡ matches main or _ no commits ahead).
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_short.snap b/tests/snapshots/integration__integration_tests__help__help_list_short.snap
index 8484e4568..7b639a9bd 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_short.snap
@@ -28,7 +28,7 @@ Usage: wt list [OPTIONS]
--format <FORMAT> Output format (table, json) [default: table]
--branches Include branches without worktrees
--remotes Include remote branches
- --full Show CI, conflicts, diffs
+ --full Show CI and line diffs
--progressive Show fast info immediately, update with slow info
-h, --help Print help (see more with '--help')