Merge pull request #10647 from gitbutlerapp/kv-branch-57

krlvi · web-flow · commit d6f7d3c98d75 · 2025-10-14T08:05:17.000-07:00
fix(ui): correct message to "workspace conflictCorrect the error message in CherryApplyModal from "would cause
diff --git a/apps/desktop/src/components/CherryApplyModal.svelte b/apps/desktop/src/components/CherryApplyModal.svelte
@@ -68,7 +68,7 @@
 			case 'lockedToStack':
 				return 'This commit conflicts when applied to the selected stack, as such it must be applied to the selected stack to avoid a workspace conflict.';
 			case 'causesWorkspaceConflict':
-				return "This commit can't be applied since it would cause a workspace.";
+				return "This commit can't be applied since it would cause a workspace conflict.";
 			case 'noStacks':
 				return 'No stacks are currently applied to the workspace.';
 		}

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@`
`68`	`68`	`case 'lockedToStack':`
`69`	`69`	`return 'This commit conflicts when applied to the selected stack, as such it must be applied to the selected stack to avoid a workspace conflict.';`
`70`	`70`	`case 'causesWorkspaceConflict':`
`71`		`- return "This commit can't be applied since it would cause a workspace.";`
	`71`	`+ return "This commit can't be applied since it would cause a workspace conflict.";`
`72`	`72`	`case 'noStacks':`
`73`	`73`	`return 'No stacks are currently applied to the workspace.';`
`74`	`74`	`}`