Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Replace merge-tree conflict indicator with crossed swords symbol
Maximilian Roosd3845ba166b3
diff --git a/docs/content/list.md b/docs/content/list.mdindex 3e027e141..4fe2f0447 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -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 (`--full` only) || | `≡` | 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.rsindex 995533b57..c06104d26 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -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 (`--full` only) || | `≡` | Matches main (identical contents) || | `_` | No commits ahead, clean working tree || Main divergence | `^` | Is the main branch |diff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex 530dfb20f..daa94404e 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -764,7 +764,7 @@ impl serde::Serialize for WorktreeState {/// 1. Conflicts (✖) - blocking, must resolve/// 2. Rebase (↻) - active operation/// 3. Merge (⋈) - active operation-/// 4. MergeTreeConflicts (⊘) - potential problem+/// 4. MergeTreeConflicts (⚔) - potential problem/// 5. MatchesMain (≡) - removable/// 6. NoCommits (_) - removable#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, strum::IntoStaticStr)]@@ -794,7 +794,7 @@ impl std::fmt::Display for BranchOpState {Self::Conflicts => write!(f, "✖"),Self::Rebase => write!(f, "↻"),Self::Merge => write!(f, "⋈"),- Self::MergeTreeConflicts => write!(f, "⊘"),+ Self::MergeTreeConflicts => write!(f, "⚔"),Self::MatchesMain => write!(f, "≡"),Self::NoCommits => write!(f, "_"),}@@ -930,7 +930,7 @@ impl PositionMask {#[derive(Debug, Clone, Default)]pub struct StatusSymbols {/// Combined branch and operation state (mutually exclusive with priority)- /// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⊘) > MatchesMain (≡) > NoCommits (∅)+ /// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⚔) > MatchesMain (≡) > NoCommits (∅)pub(crate) branch_op_state: BranchOpState,/// Worktree state: / for branches, ⚑⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)diff --git a/src/md_help.rs b/src/md_help.rsindex 76e636a51..a5f868a46 100644--- a/src/md_help.rs+++ b/src/md_help.rs@@ -305,7 +305,7 @@ fn colorize_status_symbols(text: &str) -> String {// Git operations, MergeTreeConflicts: WARNING (yellow)result = replace_dim(result, "↻", warning);result = replace_dim(result, "⋈", warning);- result = replace_dim(result, "⊘", warning);+ result = replace_dim(result, "⚔", warning);// Worktree state: PathMismatch (red), Prunable/Locked (yellow)result = replace_dim(result, "⚑", error);diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snapindex 54a94167b..ab58306c9 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap@@ -120,7 +120,7 @@ Symbols appear in the Status column in this order:[31m✖[0m Merge conflicts[33m↻[0m Rebase in progress[33m⋈[0m Merge in progress- Branch state [33m⊘[0m Would conflict if merged to main ([2m--full[0m only)+ Branch state [33m⚔[0m Would conflict if merged to main ([2m--full[0m only)[2m≡[0m Matches main (identical contents)[2m_[0m No commits ahead, clean working treeMain divergence [2m^[0m Is the main branchdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snapindex 67bbfe249..05f0b74b9 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m[2m⇡[22m [1m./repo[0m [32m⇡1[0m [2m85ed6d3d[0m [2m1d[0m [2mMain advances[0m-+ feature [36m+[39m[36m![39m[36m?[39m[33m⊘[39m[2m↕[22m[2m⇅[22m[33m⊠[39m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./repo.feature [32m⇡1[0m [2m[31m⇣1[0m [2m4afb2b9e[0m [2m1d[0m [2mLocal commit[0m++ feature [36m+[39m[36m![39m[36m?[39m[33m⚔[39m[2m↕[22m[2m⇅[22m[33m⊠[39m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./repo.feature [32m⇡1[0m [2m[31m⇣1[0m [2m4afb2b9e[0m [2m1d[0m [2mLocal commit[0m⚪ [2mShowing 2 worktrees, 1 with changes, 1 ahead[0m