Ara
Download

Search or run a command

Jump to a section or open an Ara link.

Protocol method · collab

collab.conflicts

The conflict log: changes that lost (overwritten, dropped, kept-live in a merge), with both values.

  • Scope: read
  • Service: collab

Params

ParamRequiredDescription
sessionyesSession handle from session.begin.
mineOnly the conflicts this session lost (default true).