Thread:Sannse/@comment-5989773-20130603161254/@comment-8-20130603231200

When there's an edit conflict, all your changes are shown on the conflict page. So you can copy that and paste it into the edit box. It's considered rude to do that without including the edits of the other person in the conflict - but if they have made a tiny edit, that would have been overwritten with your edit, then it's ok.

I sometimes find it easiest to open a new edit window in a new tab, and then merge the two versions as a non-conflicted edit, but either way works! As long as you recover all your hard work from the conflict page of course :)