A source control tool such as git or mercurial will solve this. Any collaborator who uses vi should have no issues with a git/hg workflow for managing changes.

▲

Finnucane 4 hours ago | parent [-]

Version control is not editing.

▲

bccdee 3 hours ago | parent [-]

The workflow the original post is describing is basically a merge request.

	▲	Finnucane an hour ago \| parent [-]
		What, and do seperate commits and merges for every comma and dangling modifier? That makes no sense. In addition, there needs to be comments and queries.