resulgit 1.0.14 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resulgit",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "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

@@ -1406,15 +1406,29 @@ async function cmdPush(opts) {
     const merged = {}
     const paths = new Set([...Object.keys(base), ...Object.keys(remote.files), ...Object.keys(local).map(k => k)])
     spinnerUpdate(spinner, 'Merging changes...')
+
+    // Helper to check if content has unresolved conflict markers
+    const hasConflictMarkers = (content) => {
+      if (!content) return false
+      return content.includes('<<<<<<<') && content.includes('=======') && content.includes('>>>>>>>')
+    }
+
     for (const p of paths) {
       const b = p in base ? base[p] : null
       const r = p in remote.files ? remote.files[p] : null
       const l = p in local ? local[p].content : null
       const changedLocal = String(l) !== String(b)
       const changedRemote = String(r) !== String(b)
-      if (changedLocal && changedRemote && String(l) !== String(r)) {
+
+      // Check if local file has conflict markers (unresolved)
+      if (l && hasConflictMarkers(l)) {
         const line = firstDiffLine(l || '', r || '')
-        conflicts.push({ path: p, line })
+        conflicts.push({ path: p, line, reason: 'Unresolved conflict markers in file' })
+      } else if (changedLocal && changedRemote && String(l) !== String(r)) {
+        // Both changed and different - but if local is the "resolved" version, use it
+        // This happens when user resolved a conflict and is pushing the resolution
+        // The local version wins if it doesn't have conflict markers
+        if (l !== null) merged[p] = l
       } else if (changedLocal && !changedRemote) {
         // Local changed, use local version
         if (l !== null) merged[p] = l
@@ -1430,14 +1444,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
     }