EditConflictAlert gives a banner-like notification when the page you are editing gets edited, from which you can display the diff of that respective edit. You can also opt to replace your text with the new content (your edit won't be lost, it will be moved to another non-editable input at the bottom of the page).