TL;DR: Make this not happen again.
What happened:
- I triggered an edit conflict while editing a single section on a long discussion page.
- I got the "Your changes could not be saved because of an edit conflict. Would you like to resolve the conflict manually?" box.
- I clicked "Resolve conflict" to fix it.
Results: Do not get dumped to the 2010 wikitext editor to resolve the edit conflict; do not get $200. Go directly to the newly saved page, upon which everything except the section I was editing has been blanked.
Also, the edit was tagged as Visual editor:Switched, even though it's not possible to use the visual mode in that namespace.
I have not been able to reproduce this.