Key:merge conflict resolved

changeset key: merge_conflict_resolved
Description
Indiciates whether a merge conflict was encountered while uploading this changeset.
Group: changeset
Used on:
Status on changesets:
in use

Some web-based editors such as iD and Rapid add this tag to changesets to indicate whether a Merge Conflict occured while uploading the changeset.

There are two possible values:

• merge_conflict_resolved=automatically means that the editor automatically resolved the conflict. This means the user did not need to take any action.
  • Example
• merge_conflict_resolved=manually means that the editor required the user to manually resolve the conflict. For example, by choosing whether to keep their own version, or keep the upstream version.
  • Example