As of I002c5a when saving and an edit conflict occurs the user is shown a browser-provided confirmation box which allows them to either cancel or resolve the conflict manually.
It would be much better if this was integrated into the save dialog.
Version: unspecified
Severity: enhancement