(This probably is not the proper component, but I couldn't figure out which was.)

 

I made an edit to a release via the Web site.  Then I made a different edit, which conflicted.  (I knew that, it was fine, the second one was better.)

I got email from ModBot saying "Data has changed since this edit was entered, and now conflicts with changes made in this edit." and telling me how to reply to the note.

This does not give me much guidance as to what I should do.  If I do nothing, what happens?  Does the first edit stand or does the second edit stand?  If I reply to the note, what happens?  Does a human then decide whether to take the first or the second edit?  

It would also be nice to take the passive voice out of the message, but I realize I can't have everything.

 

It would be nice if there was a bit more guidance in the message, something like:

"Someone made a change to the data after your edit.  Their change conflicts with your change. 

If you do nothing, their edit will be used and yours will be discarded.  If you think that your edit was better than theirs, reply to the edit note by going to <url> and a human will review the conflict.  (Please do not reply to this email; messages to this account get thrown away.)"

 

Thanks!