Last modified: 2013-05-14 23:36:46 UTC
As of I002c5aa23704c1c46ef46fa1970a4254614b9eb1 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.
Related URL: https://gerrit.wikimedia.org/r/63679 (Gerrit Change I709d936d998b130515b62de880c6e7aa7978786b)
Merged into master and will go out with wmf5.