Skip to content

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

Reorganize status symbol categories for merge conflicts

Maximilian Roos89103a6da957
diff --git a/docs/content/list.md b/docs/content/list.md
index 83b0bce1a..756709d58 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -108,10 +108,10 @@ Symbols appear in the Status column in this order:
| Working tree | `+` | Staged files |
| | `!` | Modified files (unstaged) |
| | `?` | Untracked files |
-| | `✖` | Merge conflicts |
+| Branch state | `✖` | Merge conflicts |
| | `↻` | Rebase in progress |
| | `⋈` | Merge in progress |
-| Branch state | `⚔` | Would conflict if merged to main |
+| | `⚔` | Would conflict if merged to main |
| | `≡` | Matches main (identical contents) |
| | `_` | No commits ahead, clean working tree |
| Main divergence | `^` | Is the main branch |
diff --git a/src/cli.rs b/src/cli.rs
index 528ce44d1..261e1f10a 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1419,10 +1419,10 @@ Symbols appear in the Status column in this order:
| Working tree | `+` | Staged files |
| | `!` | Modified files (unstaged) |
| | `?` | Untracked files |
-| | `✖` | Merge conflicts |
+| Branch state | `✖` | Merge conflicts |
| | `↻` | Rebase in progress |
| | `⋈` | Merge in progress |
-| Branch state | `⚔` | Would conflict if merged to main |
+| | `⚔` | Would conflict if merged to main |
| | `≡` | Matches main (identical contents) |
| | `_` | No commits ahead, clean working tree |
| Main divergence | `^` | Is the main branch |
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 db81fc25a..e6b5f6431 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -117,10 +117,10 @@ Symbols appear in the Status column in this order:
Working tree + Staged files
! Modified files (unstaged)
? Untracked files
- ✖ Merge conflicts
+ Branch state ✖ Merge conflicts
↻ Rebase in progress
⋈ Merge in progress
- Branch state ⚔ Would conflict if merged to main
+ ⚔ Would conflict if merged to main
≡ Matches main (identical contents)
_ No commits ahead, clean working tree
Main divergence ^ Is the main branch