resulgit 1.0.15 → 1.0.16

package/package.json

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