Last modified: 2014-09-14 10:56:11 UTC
Currently we just ignore Edit Conflicts and just overwrite the conflicting edit. This is 'bad' and we should get to have some way of both: 1. Letting the user know that a conflict has occured 2. Some way of resolving it