Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
style: improve RefBaseConflict hint message formatting
Maximilian Roosd173f5dddf5a
diff --git a/src/git/error.rs b/src/git/error.rsindex 0512e40b7..9bc77b405 100644--- a/src/git/error.rs+++ b/src/git/error.rs@@ -724,7 +724,9 @@ impl std::fmt::Display for GitError {error_message(cformat!("Cannot use <bold>--base</> with <bold>{syntax}{number}</>")),- hint_message(format!("{name_plural} already have a base; remove --base"))+ hint_message(cformat!(+ "{name_plural} already have a base; remove <bright-black>--base</>"+ )))}diff --git a/tests/snapshots/integration__integration_tests__switch__switch_mr_base_conflict.snap b/tests/snapshots/integration__integration_tests__switch__switch_mr_base_conflict.snapindex c11f7a76e..bf0960858 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_mr_base_conflict.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_mr_base_conflict.snap@@ -38,4 +38,4 @@ exit_code: 1----- stderr -----[31m✗[39m [31mCannot use [1m--base[22m with [1mmr:101[22m[39m-[2m↳[22m [2mMRs already have a base; remove --base[22m+[2m↳[22m [2mMRs already have a base; remove [90m--base[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_pr_base_conflict.snap b/tests/snapshots/integration__integration_tests__switch__switch_pr_base_conflict.snapindex da3293bd7..3592cda58 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_pr_base_conflict.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_pr_base_conflict.snap@@ -38,4 +38,4 @@ exit_code: 1----- stderr -----[31m✗[39m [31mCannot use [1m--base[22m with [1mpr:101[22m[39m-[2m↳[22m [2mPRs already have a base; remove --base[22m+[2m↳[22m [2mPRs already have a base; remove [90m--base[39m[22m