resulgit 1.0.15 → 1.0.17

package/README.md

@@ -48,10 +48,13 @@ resulgit <command> [options]
 ### Branch Operations
 
 - `resulgit branch list` - List all branches
-- `resulgit branch create --name <branch> [--base <branch>]` - Create new branch
-- `resulgit branch delete --name <branch>` - Delete a branch
-- `resulgit switch --branch <name>` - Switch to a branch
-- `resulgit checkout --branch <name>` - Checkout a branch
+- `resulgit branch create <name>` - Create new branch (simple)
+- `resulgit branch create <name> --base <branch>` - Create from specific base
+- `resulgit branch delete <name>` - Delete a branch
+- `resulgit switch <branch>` - Switch to a branch
+- `resulgit switch -c <branch>` - Create and switch to new branch
+- `resulgit checkout <branch>` - Checkout a branch
+- `resulgit merge <branch>` - Merge a branch into current
 
 ### File Operations
 

package/package.json

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

@@ -44,13 +44,15 @@ function parseArgs(argv) {
       const key = t.slice(1)
       const val = tokens[i + 1] && !tokens[i + 1].startsWith('-') ? tokens[++i] : 'true'
       opts[key] = val
-    } else if (cmd.length < 2) {
+    } else if (cmd.length < 3) {
+      // Allow up to 3 positional args: e.g. 'branch create DevBranch'
       cmd.push(t)
     }
   }
   // Map short flags to long flags
   if (opts.m && !opts.message) { opts.message = opts.m; delete opts.m }
   if (opts.a && !opts.all) { opts.all = opts.a; delete opts.a }
+  if (opts.b && !opts.branch) { opts.branch = opts.b; delete opts.b }
   return { cmd, opts }
 }
 
@@ -1406,15 +1408,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
@@ -3340,10 +3356,18 @@ async function main() {
     return
   }
   if (cmd[0] === 'branch') {
+    // Support positional: 'branch create DevBranch' or 'branch delete DevBranch'
+    if ((cmd[1] === 'create' || cmd[1] === 'delete') && cmd[2] && !opts.name) {
+      opts.name = cmd[2]
+    }
     await cmdBranch(cmd[1], opts)
     return
   }
   if (cmd[0] === 'switch') {
+    // Support positional: 'switch main' instead of 'switch --branch main'
+    if (cmd[1] && !cmd[1].startsWith('-') && !opts.branch) {
+      opts.branch = cmd[1]
+    }
     await cmdSwitch(opts)
     return
   }
@@ -3356,6 +3380,10 @@ async function main() {
     return
   }
   if (cmd[0] === 'merge') {
+    // Support positional: 'merge DevBranch' instead of 'merge --branch DevBranch'
+    if (cmd[1] && !cmd[1].startsWith('-') && !opts.branch) {
+      opts.branch = cmd[1]
+    }
     await cmdMerge(opts)
     return
   }