resulgit 1.0.11 → 1.0.13

package/package.json

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

@@ -1379,11 +1379,16 @@ async function cmdPush(opts) {
         const line = firstDiffLine(l || '', r || '')
         conflicts.push({ path: p, line })
       } else if (changedLocal && !changedRemote) {
+        // Local changed, use local version
         if (l !== null) merged[p] = l
       } else if (!changedLocal && changedRemote) {
+        // Remote changed, use remote version
         if (r !== null) merged[p] = r
       } else {
-        if (b !== null) merged[p] = b
+        // No changes - include the file from whatever source has it
+        if (l !== null) merged[p] = l
+        else if (r !== null) merged[p] = r
+        else if (b !== null) merged[p] = b
       }
     }
     if (conflicts.length > 0) {
@@ -1399,6 +1404,18 @@ async function cmdPush(opts) {
       }
       return
     }
+
+    // Check if there are any files to push
+    if (Object.keys(merged).length === 0) {
+      spinnerFail(spinner, 'Nothing to push')
+      if (opts.json === 'true') {
+        print({ error: 'No files to push' }, true)
+      } else {
+        process.stdout.write('No files to push. Add some files first.\n')
+      }
+      return
+    }
+
     // Execute pre-push hook
     spinnerUpdate(spinner, 'Running pre-push hook...')
     try {
@@ -1413,7 +1430,7 @@ async function cmdPush(opts) {
     }
 
     const body = { message: localMeta.pendingCommit?.message || (opts.message || 'Push'), files: merged, branchName: remoteMeta.branch }
-    spinnerUpdate(spinner, `Pushing to '${remoteMeta.branch}'...`)
+    spinnerUpdate(spinner, `Pushing ${Object.keys(merged).length} file(s) to '${remoteMeta.branch}'...`)
     const url = new URL(`/api/repositories/${remoteMeta.repoId}/commits`, server).toString()
     const data = await request('POST', url, body, token)
     localMeta.baseCommitId = data.id || remote.commitId || ''