Skip to content

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.md
index 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.rs
index 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.rs
index 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.rs
index 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.snap
index 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:
✖ 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/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index 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 -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
@ main ^⇡ ./repo ⇡1 85ed6d3d 1d Main advances
-+ feature +!?⊘↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 4afb2b9e 1d Local commit
++ feature +!?⚔↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 4afb2b9e 1d Local commit
⚪ Showing 2 worktrees, 1 with changes, 1 ahead