Skip to content

Update from code changes: document branch diff and merge#315

Merged
jackye1995 merged 1 commit into
mainfrom
mintlify/fb196a72
Jul 18, 2026
Merged

Update from code changes: document branch diff and merge#315
jackye1995 merged 1 commit into
mainfrom
mintlify/fb196a72

Conversation

@mintlify

@mintlify mintlify Bot commented Jul 18, 2026

Copy link
Copy Markdown
Contributor

Summary

Documents the new branch diff and merge client APIs on LanceDB Enterprise, which let you review a branch's changes against main and promote its added columns without reissuing the branch's writes. Adds Python and TypeScript examples for previewing (dry_run), landing merges, and handling rejected merges via mergeBlockers. Updates the existing "Apply branch-tested changes to main" section to point at the new workflow. Upstream PR: lancedb/lancedb#3686

Changes

  • Added "Compare and merge a branch into main" section to the Branches page, with diff and merge examples in Python and TypeScript.
  • Called out that these APIs are Enterprise (remote) only; local tables raise NotSupported.
  • Documented status values (ready, merged, rejected, notImplemented, unknown) and common mergeBlockers codes.
  • Updated the warning and bullet list in "Apply branch-tested changes to main" to link to the new section.

@mintlify

mintlify Bot commented Jul 18, 2026

Copy link
Copy Markdown
Contributor Author

Preview deployment for your docs. Learn more about Mintlify Previews.

Project Status Preview Updated (UTC)
lancedb-bcbb4faf 🟢 Ready View Preview Jul 18, 2026, 7:42 PM

@jackye1995
jackye1995 merged commit 9de606f into main Jul 18, 2026
2 checks passed
@jackye1995
jackye1995 deleted the mintlify/fb196a72 branch July 18, 2026 19:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant