pm workspace merge

Install merge drivers, reconcile or report post-merge history, or run a field-aware driver.

Uso

pm workspace merge [options] <subcommand> [artifact] [base] [ours] [theirs]

<subcommand>	Merge subcommand: install, reconcile, report, driver	obligatorio
<artifact>	driver only: artifact class to merge (item, history, relationship, json)	opcional
<base>	driver only: common-ancestor file path (git %O)	opcional
<ours>	driver only: current-branch file path (git %A)	opcional
<theirs>	driver only: other-branch file path (git %B)	opcional

--dry-run	install/reconcile: preview changes without writing	opcional
--message <text>	reconcile only: audit message recorded on repaired history streams	opcional
--force	reconcile only: permit the underlying audited history ownership override	opcional
--include-reconciled	report only: include clone-local receipts already recorded in history	opcional
--output <path>	driver only: write the merged content to this path instead of the ours path	opcional
--item-path <path>	driver only: original repository-relative path supplied by git as %P	opcional
--prefer <side>	driver only: side that wins unresolvable conflicts (ours\|theirs; default ours)	opcional

pm workspace merge --help