All commands · workspace
pm workspace merge
Install merge drivers, reconcile or report post-merge history, or run a field-aware driver.
Install merge drivers, reconcile or report post-merge history, or run a field-aware driver.
Usage
pm workspace merge [options] <subcommand> [artifact] [base] [ours] [theirs]Arguments
| <subcommand> | Merge subcommand: install, reconcile, report, driver | required |
|---|---|---|
| <artifact> | driver only: artifact class to merge (item, history, relationship, json) | optional |
| <base> | driver only: common-ancestor file path (git %O) | optional |
| <ours> | driver only: current-branch file path (git %A) | optional |
| <theirs> | driver only: other-branch file path (git %B) | optional |
Options
| --dry-run | install/reconcile: preview changes without writing | optional |
|---|---|---|
| --message <text> | reconcile only: audit message recorded on repaired history streams | optional |
| --force | reconcile only: permit the underlying audited history ownership override | optional |
| --include-reconciled | report only: include clone-local receipts already recorded in history | optional |
| --output <path> | driver only: write the merged content to this path instead of the ours path | optional |
| --item-path <path> | driver only: original repository-relative path supplied by git as %P | optional |
| --prefer <side> | driver only: side that wins unresolvable conflicts (ours|theirs; default ours) | optional |
Examples
pm workspace merge --help