opencode-mad 0.3.1 → 0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/plugins/mad-plugin.ts +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "opencode-mad",
3
- "version": "0.3.1",
3
+ "version": "0.3.2",
4
4
  "description": "Multi-Agent Dev - Parallel development orchestration plugin for OpenCode",
5
5
  "type": "module",
6
6
  "main": "plugins/mad-plugin.ts",
package/plugins/mad-plugin.ts CHANGED
@@ -13,7 +13,7 @@ import { execSync } from "child_process"
13
13
  */
14
14
 
15
15
  // Current version of opencode-mad
16
- const CURRENT_VERSION = "0.3.1"
16
+ const CURRENT_VERSION = "0.3.2"
17
17
 
18
18
  // Update notification state (shown only once per session)
19
19
  let updateNotificationShown = false
@@ -434,7 +434,7 @@ Handles merge conflicts by reporting them.`,
434
434
  return getUpdateNotification() + `Cannot merge: worktree ${args.worktree} is not marked as done. Complete the task first.`
435
435
  }
436
436
 
437
- const result = runCommand(`git merge ${branch} --no-edit`, gitRoot)
437
+ const result = runCommand(`git merge --no-ff ${branch} --no-edit`, gitRoot)
438
438
  if (result.success) {
439
439
  return getUpdateNotification() + `✅ Successfully merged ${branch}!\n\n${result.output}`
440
440
  } else {