PersistentAI API Documentation / @persistentai/fireflow-vfs / generated/lakefs/types.gen / Merge

Type Alias: Merge

Merge = object

Defined in: packages/fireflow-vfs/src/generated/lakefs/types.gen.ts:339

Properties

allow_empty?

optional allow_empty: boolean

Defined in: packages/fireflow-vfs/src/generated/lakefs/types.gen.ts:355

Allow merge when the branches have the same content

---

force?

optional force: boolean

Defined in: packages/fireflow-vfs/src/generated/lakefs/types.gen.ts:351

Allow merge into a read-only branch or into a branch with the same content

---

message?

optional message: string

Defined in: packages/fireflow-vfs/src/generated/lakefs/types.gen.ts:340

---

metadata?

optional metadata: object

Defined in: packages/fireflow-vfs/src/generated/lakefs/types.gen.ts:341

Index Signature

[key: string]: string

---

squash_merge?

optional squash_merge: boolean

Defined in: packages/fireflow-vfs/src/generated/lakefs/types.gen.ts:364

If set, set only the destination branch as a parent, which "squashes" the merge to appear as a single commit on the destination branch. The source commit is no longer a part of the merge commit; consider adding it to the 'metadata' or 'message' fields. This behaves like a GitHub or GitLab "squash merge", or in Git terms 'git merge --squash; git commit ...'.

---

strategy?

optional strategy: string

Defined in: packages/fireflow-vfs/src/generated/lakefs/types.gen.ts:347

In case of a merge conflict, this option will force the merge process to automatically favor changes from the dest branch ('dest-wins') or from the source branch('source-wins'). In case no selection is made, the merge process will fail in case of a conflict