Skip to content

Changes and conflicts with Main

A change is an artefact whose view in a workstream differs from Main. The Changes page lists them, shows the diff, puts them in tasks and resolves conflicts.

What counts as a change

An artefact is a change of a workstream when the workstream's version differs from Main's:

ChangeWhat it means
AddedThe artefact is not on Main.
ModifiedThe workstream's version differs from Main's.
ArchivedThe artefact is live on Main and archived in the workstream.

Edit an artefact back to what Main has and it is no longer a change. Changes are derived, so nothing needs cleaning up.

The Changes page

  • Unrouted changes are in no task yet; the sidebar badge counts them. Routed ones show their task.
  • Diff shows every changed field against Main, with a word-level diff for long text and member paths such as Scenario 2 / Step 3.
  • Add to task scopes the selected changes into a Draft task, or a new one.
  • Discard sets an unrouted change back to Main's version. The discarded version is kept in the history of the artefact.

Conflicts with Main

Main moves when another workstream's task publishes. For each change of yours:

  • if Main's edits and yours touch different fields, nothing is shown: publish rebases your change over Main;
  • if they overlap, or Main archived what you edit, or Main now has another artefact with your artefact's name, or your artefact refers to something Main removed, the change is in conflict.

Conflicts are listed at the top of Changes and marked on the task. A task with a conflict cannot publish. Resolve each one:

ChoiceEffect
Keep MainYour change is dropped for this artefact.
Keep workstreamYour values win on the conflicting fields; Main's other edits stay.
Edit and mergeYou pick field by field from the three versions: base, Main and workstream.

A fix you make by hand that clears the overlap clears the conflict too. When a conflict appears, a conflict thread opens on the artefact, naming the task that caused it, and it resolves when the conflict is cleared.

Note

An agent's merge is staged

An agent merges a conflict with task_resolveConflict. The merge is staged in the workstream's proposal for a person to accept, and accepting it resolves the conflict, as long as Main and the workstream did not move since the agent merged. Proposals, plans and review covers accepting.

Badges

The sidebar shows unrouted changes (with the conflicts next to them), pending revisions of the proposal (in the warning tone when one needs attention) and open threads. The counts update live and come with the event itself.

Next steps