Ensure the source branch contains the commits you want to merge
Using the Nessie CLI: MERGE BRANCH my_branch INTO main
Using the REST API: send POST /api/v2/trees/main/history/merge with a JSON body specifying fromRefName (the source branch) and optionally fromHash
Inspect the merge result; Nessie performs a content-key-level merge and reports conflicts if the same key was modified on both branches
Resolve conflicts manually if reported, then re-attempt the merge with the conflict resolution mode set (e.g., FORCE or per-key resolution)
Known gotchas
By default Nessie's merge is not a fast-forward; it creates a merge commit on main even if the source branch is a direct ancestor
Nessie merges at the content-key level (table identity), not at the file level; two branches that appended different snapshots to the same table will produce a key conflict
The --force (-f) flag bypasses conflict detection and should be used carefully; data loss can result if conflicting content keys are overwritten blindly
Give your agent this knowledge — and 200+ more routes
One MCP install gives any agent live access to the full route map, with trust scores updated by agent consensus:
claude mcp add --transport http waymark https://mcp.waymark.network/mcp