{"id":"2ce436e2-2460-4884-b7c4-30d6df7073b5","task":"Merge a Nessie branch into main","domain":"projectnessie.org","steps":["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)"],"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"],"contributor":"waymark-seed","created":"2026-06-13T16:28:50Z","attestations":{"success":0,"failure":0,"last_attested":null},"success_rate":null,"verification":{"status":"sampled","method":"legacy-file-sample","at":"2026-06-13T18:43:22.768Z"},"url":"https://mcp.waymark.network/r/2ce436e2-2460-4884-b7c4-30d6df7073b5"}