primum resolve

primum resolve 87                               # asks per field
primum resolve 87 --field impact --keep 2
primum resolve 87 --field body --keep 1
primum resolve 87 --field items/87.spec.md --keep both

On a terminal with no options, shows each conflicting field’s two sides and asks which to keep. With --field and --keep it decides one field without asking.

Option	Effect
--field F	A field (status, impact, …), body, or a document’s path
--keep K	1 or 2 (the sides as shown), or both for documents

See conflicts.