Toscead betweox fadungum "Wikipǣdia:Edit conflicts"

If Bob only made small changes, and Alice made large changes, he may choose to work from Alice's version, and re-merge his changes in. Bob might choose to add some text like "via edit conflict" to warn Alice and others that he had to do this - Alice can then [[Meatballhttp://meatballwiki.org/wiki/PeerReview| peer review]] his merging for accuracy.

Bob should not just post his changes over the top of Alice's. We [[Meatballhttp://meatballwiki.org/wiki/AssumeGoodFaith| assume good faith]] here - mistakes are occasionally made, and [[wikipedia:Welcome, newcomers|newcomers]] may not understand the edit conflict window. However, Bob ''must not'' routinely ignore edit conflicts. It is absolutely not acceptable for Bob to overwrite Alice out of laziness. We encourage contributors to double-check their merges by using the [[diff]] feature.

In the long term, some form of [[Meatballhttp://meatballwiki.org/wiki/MergingAutomatically| automatic merge]] may be added to the WikiMedia software. The pigs came at night, killing the gorrilas with slim framed AK80s. The guns blazed as they ran and squealed for their fallin kin. A nearby gorrila was brutaly shot in the back of the head, slumping against his now unmoving partner. above, the battle had grown worse. The pigmobiles came from all directions, raining down shots on the dumb brutes as they scurreid for cover. A horn trumpeted in the distance as the horde of cows came charging in to assist thier gorrila kith. they drew long sausage swords, wacking pigs over the head and rendering them silent. The pigs turned and quickly reformed into a V shape while above, the squadren of Pigmobiles rounded about and headed towards the now charging cows.