chat worked

frontend/src/components/git/ConflictResolver.svelte

@@ -26,7 +26,7 @@
     // [SECTION: STATE]
     const dispatch = createEventDispatcher();
     /** @type {Object.<string, 'mine' | 'theirs' | 'manual'>} */
-    let resolutions = {};
+    let resolutions = $state({});
     // [/SECTION]
 
     // [DEF:resolve:Function]
@@ -126,7 +126,7 @@
                                     ] === 'mine'
                                         ? 'bg-blue-600 text-white'
                                         : 'bg-gray-50 hover:bg-blue-50 text-blue-600'}"
-                                    on:click={() =>
+                                    onclick={() =>
                                         resolve(conflict.file_path, "mine")}
                                 >
                                     Keep Mine
@@ -148,7 +148,7 @@
                                     ] === 'theirs'
                                         ? 'bg-green-600 text-white'
                                         : 'bg-gray-50 hover:bg-green-50 text-green-600'}"
-                                    on:click={() =>
+                                    onclick={() =>
                                         resolve(conflict.file_path, "theirs")}
                                 >
                                     Keep Theirs
@@ -161,13 +161,13 @@
 
             <div class="flex justify-end space-x-3 pt-4 border-t">
                 <button
-                    on:click={() => (show = false)}
+                    onclick={() => (show = false)}
                     class="px-4 py-2 text-gray-600 hover:bg-gray-100 rounded transition-colors"
                 >
                     Cancel
                 </button>
                 <button
-                    on:click={handleSave}
+                    onclick={handleSave}
                     class="px-4 py-2 bg-blue-600 text-white rounded hover:bg-blue-700 transition-colors shadow-sm"
                 >
                     Resolve & Continue