What is meta? ×
Meta Stack Exchange is where users like you discuss bugs, features, and support issues that affect the software powering all 128 Stack Exchange communities.

I haven't seen this happen yet.

share|improve this question
    
I posted a suggestion for getting around this issue: meta.stackexchange.com/questions/22135/…. Doesn't seem to have garnered much interest though. –  Noldorin Oct 2 '09 at 13:33
    
Note that TheTXI and me both began editing revision 1. He modified the body, and I modified the title and tags. Both changes were submitted, and both were preserved. –  Shog9 Oct 2 '09 at 17:37

5 Answers 5

Since March 2011, a warning is shown after you save, if a conflict occurs.

The user who clicks "Save Your Edits" second will overwrite the first person's changes.

There is no type of merging interface.

share|improve this answer
17  
And if you're especially lucky, both editors will notice that someone has stepped on someone else's toes, and both will go in and attempt to merge manually, again overwriting one another's changes. This continues until their mutual goodwill is detected as an edit war and both users are banned. –  ベレアー アダム Oct 2 '09 at 12:34
2  
... unless one of them realize that they are fighting with Rich B. and gives up. –  Brad Gilbert Oct 2 '09 at 13:03
6  
They don't give up. They whine about it to a mod. –  Joel Coehoorn Oct 2 '09 at 13:18
    
@Adam: Yet another reason why I never demonstrate good will. –  Hilarious Comedy Pesto Oct 2 '09 at 13:19
1  
Also, cue somebody posting a feature request for a merging interface... –  Hilarious Comedy Pesto Oct 2 '09 at 13:20

The universe will end, and a new one will be created, starting from the exact same moment that the last universe left off, with all of the exact same properties as the first universe, except with one fewer waffle.

In other words, every time two edits collide, random quantum fluctuations kill a waffle. Please, think of the waffles.

Note that his happens all the time. When I think my edits are going to take a long time, I leave a comment saying that I'll be editing it for a while. That way people know not to edit the question lest the universe be recreated.

share|improve this answer
2  
Edit in progress... –  random Oct 2 '09 at 12:38
    
+1 Everything for the waffles! –  fretje Oct 2 '09 at 12:39
1  
Actually, you don't have that quite right. Every time two edits collide, I kill a waffle. (I like it when there are a lot of collisions on a Saturday morning.) –  mmyers Oct 2 '09 at 17:42

Interestingly, there is limited support for merging: if one editor edits only the title, and another edits only the body, then both changes will be preserved. Same goes for tags.

share|improve this answer
    
And, since March 2011, a warning is shown after you save, if a conflict is found in fields that were edited by both parties. –  Arjan Apr 10 '11 at 20:30

Since the end of May 2011, the more substantial edit will win. There should also be an "n other users are editing this post" notification shown to all editors whenever a post is being edited by multiple users.

share|improve this answer

Both users changes will show in the revision history, with the user that saves last overwriting the user that saves first. There is no provision for locking or checking out to edit. As you said, you've never noticed this, so it works pretty well.

share|improve this answer
5  
Like the tortoise and the hare, being the slowest means you win! –  Hilarious Comedy Pesto Oct 2 '09 at 13:19
    
No longer true: since March 2011, a warning is shown after you save as well, if a conflict occurs. –  Arjan Apr 10 '11 at 20:29

You must log in to answer this question.

Not the answer you're looking for? Browse other questions tagged .