fix: editor command splitting and merge conflict detection

src/git.ts

@@ -140,7 +140,13 @@ export class GitOperations {
   async isMergeInProgress(): Promise<boolean> {
     try {
       const status = await this.git.status();
-      return status.files.some((f: StatusFile) => f.index === 'U');
+      // Any index code containing 'U' or 'A' in both indicates a conflict
+      // U = unmerged, A = added by both, D = deleted by both
+      const conflictCodes = ['U', 'A', 'D'];
+      return status.files.some((f: StatusFile) => {
+        const code = f.index;
+        return conflictCodes.some(c => code.includes(c)) || code === 'AA' || code === 'DD';
+      });
     } catch {
       return false;
     }

src/resolver.ts

@@ -20,7 +20,12 @@ export class ConflictResolver {
     console.log(`  Opening in ${editor}...`);
 
     return new Promise((resolvePromise, reject) => {
-      const editorProcess = spawn(editor, [fullPath], {
+      // Split editor command to handle args like "code --wait" or "subl -w --new-window"
+      const parts = editor.split(/\s+/);
+      const command = parts[0];
+      const args = [...parts.slice(1), fullPath];
+
+      const editorProcess = spawn(command, args, {
         stdio: 'inherit',
       });