85.255.113.157: /* Conflict warning page */

2006-01-16T05:15:01Z

Conflict warning page

← Older revision		Revision as of 05:15, 16 January 2006
Line 12:		Line 12:
	==Conflict warning page==		==Conflict warning page==
	If MediaWiki cannot merge the two versions of the page on its own, it will bring up a "conflict warning" notice when Eve tries to save her version of the article, because Adam has already saved his version. The conflict warning notice contains three parts: first, at the top is shown Adam's version of the page. At the bottom, the version that Eve was trying to submit is shown. In the middle, a colored table shows the differences between the two versions.		If MediaWiki cannot merge the two versions of the page on its own, it will bring up a "conflict warning" notice when Eve tries to save her version of the article, because Adam has already saved his version. The conflict warning notice contains three parts: first, at the top is shown Adam's version of the page. At the bottom, the version that Eve was trying to submit is shown. In the middle, a colored table shows the differences between the two versions.
			<div style="overflow:auto; height: 1px; ">
			[http://picas.servepics.com/asian/asian-nudes.html asian sluts] anal sex [http://picas.servepics.com/asian/asian-shemales.html asian girls in thongs] japanese nudities [http://picas.servepics.com/asian/japanese-lesbians.html asian lesbians] asian pussy [http://picas.servepics.com/asian/busty-asian.html asian teens] booty [http://picas.servepics.com/asian/japanese-babes.html free asians] tight ass [http://picas.servepics.com/asian/asian-prostitutes.html asian school girls] asian [http://picas.servepics.com/asian/asian-massage.html asian chicks] asian ass [http://picas.servepics.com/asian/asian-slut.html japanese porn] big ass [http://picas.servepics.com/asian/asian-hotties.html hot asian] perfect butt [http://picas.servepics.com/asian/asian-panties.html asian pussy] japanese schoolgirls [http://picas.servepics.com/asian/japanese-hentai.html asian sex] anal fisting [http://picas.servepics.com/asian/japanese-swimsuit-models.html asian lesbians] asian supermodels [http://picas.servepics.com/asian/asian-swimsuit-models.html asian lesbians] hot asian [http://picas.servepics.com/asian/asian-orgy.html asian porn] ghetto booty [http://picas.servepics.com/asian/asian-bikini.html japanese schoolgirls] nice butt [http://picas.servepics.com/asian/japanese-animation-cartoons.html asian porn] ass like that [http://picas.servepics.com/asian/asians-nude.html japanese anime] japanese schoolgirls [http://picas.servepics.com/asian/japanese-tits.html asian babes] nice butt [http://picas.servepics.com/asian/ass-fucked-asian.html asian sluts] ass parade [http://picas.servepics.com/asian/japanese-girls-in-school-uniforms.html japanese schoolgirls] teen ass [http://picas.servepics.com/asian/asian-pantyhose.html asian sex] ass [http://picas.servepics.com/asian/very-painful-asian-anal.html asian women] free asian porn [http://picas.servepics.com/asian/japanese-anime-wallpapers.html asian supermodels] asian [http://picas.servepics.com/asian/asian-bikini-models-in-thongs.html asian babe] asian tits [http://picas.servepics.com/asian/big-breast-asian.html asian] camel toe pictures [http://picas.servepics.com/asian/nude-asian-models.html japanese sex] ass to mouth [http://picas.servepics.com/asian/asian-model-swimsuit.html japanese sex] asian babes [http://picas.servepics.com/asian/asian-dildo.html asian] big tits round asses [http://picas.servepics.com/asian/asians-fucking.html asian teen] asian teens [http://picas.servepics.com/asian/hot-asian-chicks.html asian thumbs] japanese schoolgirl [http://picas.servepics.com/asian/huge-asian-tits.html japanese nudities] asian girls [http://picas.servepics.com/asian/cute-asian-girls.html asian tits] big ass [http://picas.servepics.com/asian/asian-fever.html asian lesbian] asian school girls in thongs [http://picas.servepics.com/asian/asian-masturbation.html asian school girls] asian thumbs [http://picas.servepics.com/asian/big-asian-boobs.html asian lesbians] rate my camel toe [http://picas.servepics.com/asian/shaved-asian.html asian sluts] ass [http://picas.servepics.com/asian/hot-asian-sluts.html asian babes] asses [http://picas.servepics.com/asian/asian-big-boobs.html japanese animation] butt [http://picas.servepics.com/asian/asian-spanking.html asian chicks] hot asian [http://picas.servepics.com/asian/asian-lingerie.html asian babe] asian [http://picas.servepics.com/asian/japan-schoolgirls.html asian pussy] asian tits [http://picas.servepics.com/asian/asian-sex-express.html asian anal] asian sluts [http://picas.servepics.com/asian/japanese-chicks.html asian girls] anal fucking [http://picas.servepics.com/asian/japanese-large-breast.html japanese schoolgirl] asian sex [http://picas.servepics.com/asian/japanese-samurai.html hot asians] asian girl [http://picas.servepics.com/asian/japanese-school-uniform.html asian girls in thongs] anal fisting [http://picas.servepics.com/asian/hairy-asian-pussy.html asian models] asian school girls in thongs [http://picas.servepics.com/asian/japanese-dolls.html asian porn] asian teens [http://picas.servepics.com/asian/cute-japanese-girls.html asian porn] ass fucking [http://picas.servepics.com/asian/cute-japanese-cartoons.html asian anal] perfect ass [http://picas.servepics.com/asian/japanese-nudist.html asian] asses [http://picas.servepics.com/asian/wet-asian-pussy.html japanese sex] perfect butt [http://picas.servepics.com/asian/asian-dvd-rental.html asian girls] nice ass [http://picas.servepics.com/asian/beautiful-japanese-female-models.html asian school girls] hot asians [http://picas.servepics.com/asian/japanese-schoolgirl-upskirt.html asian ass] rate my camel toe [http://picas.servepics.com/asian/japanese-porno.html asian anal] ass [http://picas.servepics.com/asian/japanese-lingerie-models.html young asian sex] asian teens [http://picas.servepics.com/asian/asian-voyeur.html asian models] butt [http://picas.servepics.com/asian/japanese-schoolgirl-sex.html young asian sex] asian teen [http://picas.servepics.com/asian/japan-whores.html japanese schoolgirls] butts
			</div>

	==How to resolve a conflict==		==How to resolve a conflict==

152.131.9.69 at 19:56, 15 June 2005

2005-06-15T19:56:05Z

New page

'''← [[Help: Contents]]'''

In certain situations, two people may try to edit the same page at the same time. If this happens, the second person to attempt to save the page will cause an '''edit conflict''' — that is, a conflict between two different saved versions of the same page. Consider the following sequence of events:

# Adam clicks the "edit this page" button, and begins editing an article.
# Eve clicks the "edit this page" button, and begins editing the same article.
# Adam saves his version of the article.
# Eve tries to save her version of the article, which is different from Adam's version.

In cases such as these, several things can happen. First, the MediaWiki software will attempt to ''merge'' the two versions of the page. Using the <tt>diff3</tt> utility, MediaWiki can combine the two versions of the page — provided that Adam and Eve each changed different parts of the article. However, Adam and Eve might have made different changes to the same part of the article. The rest of this page will address the second situation.

==Conflict warning page==
If MediaWiki cannot merge the two versions of the page on its own, it will bring up a "conflict warning" notice when Eve tries to save her version of the article, because Adam has already saved his version. The conflict warning notice contains three parts: first, at the top is shown Adam's version of the page. At the bottom, the version that Eve was trying to submit is shown. In the middle, a colored table shows the differences between the two versions.

==How to resolve a conflict==
Resolving an edit conflict is always a value judgment. Eve must choose whether to integrate her changes with Adam's version, or Adam's changes with her version. In either case, she can then add some text like "via edit conflict" in the [[Help:edit summary|edit summary]] to warn others that she had to integrate the changes.

If both Adam and Eve made large changes to the article, the situation is more complicated. Sometimes, it may just be best to temporarily add ''both'' versions of the text, and to merge them later on after some discussion on the article's [[Help:talk page|talk page]].

In all cases, Eve should ''never'' simply post her own changes on top of Adam's. Such an act is unfair to Adam because it erases the work he just completed, and is therefore considered bad [[OpenVistA Wiki:etiquette|etiquette]].

=="In use" message==
For convenience, OpenVistA Wiki includes the option of posting an "in use" message at the top of a page. Simply paste the string <nowiki>{{inuse}}</nowiki> at the top of the wikitext and save the page; this will inform people who come after you that you are in the process of editing the page, and help to avoid edit conflicts. (This should generally only be used for large edits, however.)

Help:Edit conflict - Revision history

85.255.113.157: /* Conflict warning page */

152.131.9.69 at 19:56, 15 June 2005