Chronic Pain Wikiantisemitism definition if lottery win loctite permatex 42 hdtv hitachi plasma ultravision el cuervo allan poe gay latino thug page elastomeric membranes wild sex party chicken chicken fresh fried kentucky kitchen motto fast diet zonked custom calendars batting cages for sale poor a historically blunt message trees change color vasectomy reversal doctor free real ring tones pantera dirt bike coating thickness gauge kroger.com free ringtones for metro pcs computer shopper magazine subscription sacrifice e3 skydrol business mentoring hotmail sign on gauge wika ottawa carleton catholic school boards john lyons passport application online fraud reporting solar cover reels 21 inch drop bed skirt manta ray office 2003 key generator blind skateboarding url three village garden club msi motherboard driver college rings stylart wedding invitation madison wi homes print yourself wedding invitation link data digital imaging sculptor pc policies home uncut men gallery man shirt tropical restaurant neon signs free seasonal screensaver free dog and puppy journey fleece exotic granite colors stock market technical analysis pleasant prairie realtor privera oscar de leon michael angelo batio video mauritius weather june ffviii locked out plus projectors las vegas mazda herman miller office chair 2004 flash macromedia mx updater ocean of fun kansas city anoka county school district kensington research recovery network path was not found workgroup child hair style cheap gps pda tollens test for aldehydes ebay sales share time based best franchise home ekart hareketli toyota hilux 2006 echo blower parts snippys pixie bob talib kweli and mos def bed comforter set anxiety aromatherapy candle units of weight chart southjerseydirtracing.com domain pizza hut coupon lawn aerator movie songs elite content.com australia discount tours orthopedic products nsw local governments los angeles pedestrin accident lawyer oakhill college nsw spysubtract keygen cream mp3 website This page discusses edit conflicts, and how to deal with them. An edit conflict occurs when two people try to edit the same page at the same time. The following example helps illustrate the problem:
- Alice clicks "Edit this page" on a page.
- Bob clicks "Edit this page" on the same page.
- Alice finishes her edits and clicks "Save page". The page is saved with Alice's version.
- Bob finished his edits and clicks "Save page". Bob gets an "edit conflict" page.
The following section describes the edit conflict page and what Bob needs to do to make sure nobody's edits were lost.
[edit] Layout of the edit conflict page
At the top of the edit conflict page is Alice's version of the whole page.
At the bottom of the edit conflict page is the text Bob was going to submit. This will be Bob's entire version of the page, if he edited the entire page, or Bob's version of the section he edited, if he was editing just one section.
In the middle is a diff of both versions.
[edit] Resolving an edit conflict
Bob will need to look at both versions and manually copy and paste edits from one into the other. For example, if Bob only made small changes, and Alice made large changes, he may choose to add his changes to Alice's version. If it was the other way around, he could add Alice's edits to his version.
Once he is done combining the versions, he should add an edit summary that says "via edit link" (so that others know he manually merged the versions). He should then save the version that was updated.
Important Note: This process sometimes has problems when editing sections (rather than the entire page). Specifically, it can lead to content being duplicated on the page. If you are in Bob's situation and you have only edited a section, you may want to just copy your edited section, save Alice's version on the edit conflict page, edit the page again, paste in your section and merge any edits with the existing version if necessary.