A multi-user CAx editing system may comprise a plurality of editing clients and a collaborative editing server. The server and editing clients may be collectively configured to: a) assign a feature to a first user, detect an attempt to edit the feature by a second user, and reassign the feature to the second user if the first user indicates that the feature may be reassigned, and/or b) detect an editing conflict between a first and second user for a feature and send a reversion request for the feature to one or more clients and/or c) initiate changes for a feature within a remote instance of the electronic model edited by another user and initiate reversion of the changes for the feature within a local instance of the electronic model in response to determining that the changes to the feature within the remote instance of the electronic model generated an error.