Last modified: 2013-06-05 14:02:07 UTC
Review and acceptance will move revisions to a merge workflow. Automatic merge is attempted, although the merge itself can be reviewed and approved or reverted after the fact. Merge conflicts are left in a queue to be processed by editors.