Official Flame demo
Resolve Git Merge & Package Conflicts in Flame IDE
See dependency version conflicts and lockfiles resolved, inspect a 3-way merge, and use AI when the correct result requires intent from both branches.
AI merge conflict resolution
AI merge conflict resolution: Understand and fix Git conflicts.
Use a 3-pane conflict editor for precise control, let AI resolve multi-file intent, and auto-fix package.json with npm, Yarn, pnpm, or Bun lockfiles.
Resolve with all three versions visibleCompare the current branch, the editable result, and the incoming branch while package conflicts remain in view.
The problem
A conflict is often a dependency-graph problem disguised as a text diff.
Choosing ours or theirs can compile cleanly and still remove a script, downgrade a transitive dependency, or leave a lockfile inconsistent with the source manifest.
The risk increases when an agent branch and your current branch both update package versions, migrations, generated clients, or shared configuration. The correct result depends on why each branch changed, not which side is newer.
How Flame solves it
Move from conflict detection to a verified resolution.
Manual selection and AI-assisted synthesis share the same branch, diff, terminal, and task context.
- 01
Open the conflicted branch
See the task or repository enter a conflict state and open the affected files without losing the originating agent context.
- 02
Inspect all three versions
Compare current, incoming, and resolved content in the 3-pane conflict editor before accepting either side.
- 03
Resolve dependency intent
For package conflicts, inspect the manifest changes, choose compatible dependency versions, and preserve scripts or metadata from both branches.
- 04
Regenerate supported lockfiles
For npm, Yarn, pnpm, or Bun, run the detected dependency manager so the lockfile is rebuilt from the resolved package.json instead of hand-edited as arbitrary text.
- 05
Verify and stage
Review the final diff, run the relevant install, typecheck, test, or build commands, then stage the resolved files.
Dependency-aware repair
Auto-fix package.json and the lockfile that belongs to it.
The package conflict resolver understands the supported JavaScript dependency files and can regenerate the lockfile with the manager detected in the repository.
EcosystemSource of truthGenerated or paired state
npmpackage.jsonpackage-lock.json or npm-shrinkwrap.json
Yarnpackage.jsonyarn.lock
pnpmpackage.jsonpnpm-lock.yaml
Bunpackage.jsonbun.lock or bun.lockb
Other ecosystemsAny conflicted source fileUse the 3-pane editor or AI resolution, then run that repository's own verification workflow
Product walkthrough
Watch code conflicts and package conflicts resolve in Flame.
FAQ
Merge conflict resolution questions
Resolve the change, not just the markers.
Download Flame to inspect both branches, repair dependency files, verify the result, and land the merge with confidence.
Free to use on macOS, Windows, and Linux.