Merge branch 'claudedo/295d5d409c194ba28dbb95ab13630832'

2026-08-10 15:04:46 +02:00
parent 21c9c3b3b9 afe1b68f46
commit 6db3f0f537
9 changed files with 272 additions and 15 deletions
@@ -116,6 +116,12 @@ public sealed partial class MergeModalViewModel : ViewModelBase
                    // point of the gate.
                    ErrorMessage = result.ErrorMessage ?? Loc.T("vm.merge.verifyFailed");
                    break;
+                case "untracked_collision":
+                    // Nothing landed -- the merge was refused before touching the repo. Show the
+                    // real message (it names the colliding path and size); the locale string is
+                    // only a fallback.
+                    ErrorMessage = result.ErrorMessage ?? Loc.T("vm.merge.untrackedCollision");
+                    break;
                default:
                    ErrorMessage = Loc.T("vm.merge.unknownStatus", result.Status);
                    break;