resulgit 1.0.14 → 1.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resulgit",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "A powerful CLI tool for version control system operations - clone, commit, push, pull, merge, branch management, and more",
   "main": "resulgit.js",
   "bin": {

package/resulgit.js

@@ -1430,14 +1430,44 @@ async function cmdPush(opts) {
     }
     if (conflicts.length > 0) {
       spinnerFail(spinner, 'Push blocked by conflicts')
+
+      // Write conflict markers to local files
+      for (const c of conflicts) {
+        const localContent = local[c.path]?.content || ''
+        const remoteContent = remote.files[c.path] || ''
+
+        // Create conflict-marked content
+        const conflictContent = [
+          '<<<<<<< LOCAL (your changes)',
+          localContent,
+          '=======',
+          remoteContent,
+          '>>>>>>> REMOTE (server changes)'
+        ].join('\n')
+
+        // Write to local file
+        const conflictPath = path.join(dir, c.path)
+        await fs.promises.mkdir(path.dirname(conflictPath), { recursive: true })
+        await fs.promises.writeFile(conflictPath, conflictContent, 'utf8')
+      }
+
       if (opts.json === 'true') {
-        print({ conflicts }, true)
+        print({ conflicts, message: 'Conflict markers written to files. Resolve them and try again.' }, true)
       } else {
-        process.stderr.write(color('Error: Cannot push with conflicts\\n', 'red'))
-        process.stderr.write(color('Conflicts detected:\\n', 'yellow'))
+        process.stderr.write(color('\nConflicts detected! The following files have been updated with conflict markers:\n', 'red'))
         for (const c of conflicts) {
-          process.stderr.write(color(`  ${c.path}:${c.line}\\n`, 'red'))
+          process.stderr.write(color(`  ${c.path}\n`, 'yellow'))
         }
+        process.stderr.write(color('\nTo resolve:\n', 'cyan'))
+        process.stderr.write(color('  1. Open the files above and look for conflict markers:\n', 'dim'))
+        process.stderr.write(color('     <<<<<<< LOCAL (your changes)\n', 'dim'))
+        process.stderr.write(color('     ... your version ...\n', 'dim'))
+        process.stderr.write(color('     =======\n', 'dim'))
+        process.stderr.write(color('     ... server version ...\n', 'dim'))
+        process.stderr.write(color('     >>>>>>> REMOTE (server changes)\n', 'dim'))
+        process.stderr.write(color('  2. Edit the files to keep the changes you want\n', 'dim'))
+        process.stderr.write(color('  3. Remove the conflict markers\n', 'dim'))
+        process.stderr.write(color('  4. Run: resulgit add . && resulgit commit -m "Resolved conflicts" && resulgit push\n\n', 'dim'))
       }
       return
     }