native macOS codings agent orchestrator
Resolve merge conflict in WorktreeSettingsView
Keep improved label text with modern $store binding syntax.
+3
-5
+3
-5
supacode/Features/Settings/Views/WorktreeSettingsView.swift
+3
-5
supacode/Features/Settings/Views/WorktreeSettingsView.swift
···
10
10
Section("Worktree") {
11
11
VStack(alignment: .leading) {
12
12
Toggle(
13
-
"Delete branch on archive",
13
+
"Also delete local branch",
14
14
isOn: $store.deleteBranchOnArchive
15
15
)
16
16
.help("Delete the local branch when archiving a worktree")
17
-
Text("Delete the local branch when archiving a worktree.")
18
-
.foregroundStyle(.secondary)
19
-
Text("To delete the remote branch, configure it on GitHub.")
17
+
Text("Removes the local branch along with the worktree. Remote branches must be deleted on GitHub.")
20
18
.foregroundStyle(.secondary)
21
-
Text("Warning: archived worktrees will be unrecoverable")
19
+
Text("Uncommitted changes will be lost.")
22
20
.foregroundStyle(.red)
23
21
}
24
22
.frame(maxWidth: .infinity, alignment: .leading)