Todos los comandos · workspace
pm workspace merge
Manage tracker merges.
Manage tracker merges.
Uso
pm workspace merge [options] <subcommand> [artifact] [base] [ours] [theirs]Argumentos
| <subcommand> | install | reconcile | report | driver | obligatorio |
|---|---|---|
| <artifact> | driver: item | history | relationship | json | opcional |
| <base> | driver: ancestor file (%O) | opcional |
| <ours> | driver: current file (%A) | opcional |
| <theirs> | driver: incoming file (%B) | opcional |
Opciones
| --dry-run | install/reconcile: preview | opcional |
|---|---|---|
| --pre-commit-hook | install: opt into merge settlement hook | opcional |
| --stage | reconcile: stage lossless audit evidence | opcional |
| --message <text> | reconcile: audit message | opcional |
| --force | reconcile: accept reviewed decisions | opcional |
| --include-reconciled | report: include settled receipts | opcional |
| --output <path> | driver: alternate output | opcional |
| --item-path <path> | driver: repository-relative path (%P) | opcional |
| --prefer <side> | driver: ours|theirs (default ours) | opcional |
Ejemplos
pm workspace merge --help