apply_merge
Apply a resolved merge after conflict resolution. Use finalize:false to prepare and review, then finalize:true to commit and reload the editor.
Instructions
Apply a merge whose conflicts are all resolved. Call twice: first with finalize:false to prepare and review, then finalize:true to commit. finalize:true writes the merge checkpoint onto the current branch and RELOADS the editor (the tool waits for reconnect and returns vcs_status); finalize:false does not reload. When NOT to use: to abort a merge (use cancel_merge).
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| mergeId | Yes | Id of the merge (from start_merge) | |
| finalize | Yes | false = prepare and review the merge; true = commit it (only after a finalize:false pass and all conflicts resolved) |