Misplaced Pages

Help talk:Edit conflict: Difference between revisions

Article snapshot taken from Wikipedia with creative commons attribution-sharealike license. Give it a read and then ask your questions in the chat. We can research this topic together.
Browse history interactively← Previous editNext edit →Content deleted Content addedVisualWikitext
Revision as of 04:40, 1 October 2006 editSiva1979 (talk | contribs)Extended confirmed users, Pending changes reviewers, Rollbackers36,266 editsm →what are the reasons of having one person conflict?: added missing signature← Previous edit Revision as of 18:35, 5 October 2006 edit undoSiva1979 (talk | contribs)Extended confirmed users, Pending changes reviewers, Rollbackers36,266 edits added noticeNext edit →
Line 1: Line 1:
<div class="messagebox cleanup" style="clear:all;">Ongoing redesign of the Help System is underway at the ''']'''.</div>

== ] authors and history == == ] authors and history ==
* 00:27, 10 January 2006 ] <nowiki>(rev - someone vandaled this page.)</nowiki> * 00:27, 10 January 2006 ] <nowiki>(rev - someone vandaled this page.)</nowiki>

Revision as of 18:35, 5 October 2006

Ongoing redesign of the Help System is underway at the Misplaced Pages:Help Project.

Meta:Help:Edit conflict authors and history

  • 00:27, 10 January 2006 User:72.224.57.176 (rev - someone vandaled this page.)
  • 21:40, 9 January 2006 User:201.133.168.220
  • 20:28, 8 January 2006 User:165.247.81.235
  • 20:11, 8 January 2006 User:165.247.81.235
  • 21:27, 2 January 2006 User:Amgine m (Reverted edits by 88.224.34.104 to last version by 203.206.229.49)
  • 21:24, 2 January 2006 User:88.224.34.104
  • 06:44, 23 December 2005 User:203.206.229.49 (merged from Misplaced Pages:Edit_conflicts)
  • 17:33, 17 November 2005 User:Uncle G (Fixed hyperlinks that break when this page is copied to other projects.)
  • 17:32, 17 November 2005 User:Uncle G (Fixed hyperlinks that break when this page is copied to other projects.)
  • 14:27, 29 October 2005 User:Who m (rv edits by 222.65.142.23 to last ver by Messi, link spam)
  • 13:13, 29 October 2005 User:222.65.142.23
  • 15:48, 14 October 2005 User:Messi m (rv)
  • 14:20, 14 October 2005 User:222.65.156.54
  • 21:52, 13 October 2005 User:Who m (rv edits by 219.148.86.36 to last ver by Who; link spam)
  • 17:18, 13 October 2005 User:219.148.86.36 (billclin)
  • 20:54, 12 October 2005 User:Who m (rv edits by 81.214.99.135 to last ver by Who; link spam)
  • 20:23, 12 October 2005 User:81.214.99.135
  • 08:03, 11 October 2005 User:Who m (rv edits by 222.65.155.220 to last ver by Who; link spam)
  • 07:45, 11 October 2005 User:222.65.155.220 (asd)
  • 13:04, 10 October 2005 User:Who m (rv edits by 222.65.158.252 to last good version; link spam)
  • 12:49, 10 October 2005 User:222.65.158.252 (按时的)
  • 13:06, 6 September 2005 User:216.241.47.198 (→Layout of the edit conflict page)
  • 13:04, 6 September 2005 User:216.241.47.198 (→Layout of the edit conflict page)
  • 06:46, 5 September 2005 User:Amgine (rv wikispam)
  • 06:42, 5 September 2005 User:220.161.151.218
  • 05:32, 31 August 2005 User:66.75.239.227
  • 05:32, 31 August 2005 User:66.75.239.227
  • 19:17, 25 August 2005 User:Yann m (Reverted edits by 81.214.99.179 to last version by ABCD)
  • 19:09, 25 August 2005 User:81.214.99.179
  • 00:40, 12 August 2005 User:ABCD (go around redirect)
  • 19:42, 4 August 2005 User:Datrio m (Reverted edits by 85.101.226.18 to last version by Patrick)
  • 19:41, 4 August 2005 User:85.101.226.18
  • 20:11, 21 July 2005 User:Patrick m (Reverted edits by 85.100.228.13 to last version by 4.228.252.126)
  • 19:49, 21 July 2005 User:85.100.228.13
  • 22:30, 17 July 2005 User:4.228.252.126 (rv last version by Patrick)
  • 20:38, 17 July 2005 User:85.97.134.108
  • 05:40, 23 June 2005 User:Patrick m (Reverted edits by 81.213.171.157 to last version by Angela)
  • 23:06, 22 June 2005 User:81.213.171.157
  • 23:45, 8 June 2005 User:Angela m (Reverted edits by 81.215.233.67 to last version by Jni)
  • 23:28, 8 June 2005 User:81.215.233.67
  • 13:42, 1 June 2005 User:Jni m (rv. spam)
  • 11:30, 1 June 2005 User:81.214.162.213 (→Layout of the edit conflict page)
  • 21:50, 24 May 2005 User:Patrick m (Reverted edits by 81.214.101.220 to last version by Bjh21)
  • 21:36, 24 May 2005 User:81.214.101.220
  • 13:44, 16 May 2005 User:Bjh21 (→Prevention - {{inuse}} is a template now)
  • 20:50, 8 May 2005 User:Patrick m (Reverted edits by 85.99.132.19 to last version by TheDJ)
  • 17:32, 8 May 2005 User:85.99.132.19 (→Resolving an edit conflict)
  • 23:21, 21 April 2005 User:TheDJ (add h:h and h:f)
  • 16:40, 18 April 2005 User:Patrick m
  • 09:39, 3 March 2005 User:Patrick m (→Logical edit conflicts)
  • 09:36, 3 March 2005 User:Patrick (→Logical edit conflicts - rephrase)
  • 09:30, 3 March 2005 User:Patrick (→Layout of the edit conflict page - Hence, the diff shows the combined edit, and in the case of section editing, like before, the "addition" of the other sections.)
  • 09:10, 3 March 2005 User:Patrick (In this case the upper text may be the old version instead of the one involving the first edit, i.e. the system notices the earlier change but has not processed it yet. A moment later. while one is lo)
  • 09:02, 3 March 2005 User:Patrick (When pressing Save and the system is slow, one may be able to make another edit and press Save again before the system responds. This gives an edit conflict with oneself.)
  • 08:55, 3 March 2005 User:Patrick (Bob can edit the upper text and press Save. In the case Bob was doing section editing this will be interpreted as the new version of the section, hence produce duplication of the other sections, unles)
  • 08:42, 3 March 2005 User:Patrick (→Layout of the edit conflict page - At the top is Alice's version of the whole page, even if Bob is doing section editing.)
  • 08:41, 3 March 2005 User:Patrick (For the section Bob is editing it shows Bob's changes and Alice's possible changes, except what both have changed in the same way. For the other sections it shows the full new text as if all that was)
  • 08:25, 3 March 2005 User:Patrick m (Reverted edits by 219.82.143.97 to last version by Goplat)
  • 07:32, 3 March 2005 User:219.82.143.97 (→Prevention)
  • 03:16, 19 February 2005 User:Goplat m (rv spam)
  • 02:08, 19 February 2005 User:61.242.178.231
  • 01:29, 19 February 2005 User:Patrick m (Reverted edits by 61.242.178.231 to last version by 24.30.101.127)
  • 01:24, 19 February 2005 User:61.242.178.231
  • 15:44, 11 September 2004 User:24.30.101.127 (→Prevention - Expand description of "in use" notice)
  • 08:43, 11 September 2004 User:Patrick m
  • 20:02, 10 July 2004 User:Patrick m (rv test)
  • 16:33, 10 July 2004 User:67.41.207.9
  • 02:15, 13 June 2004 User:Patrick m (→Prevention)
  • 02:14, 13 June 2004 User:Patrick m (→Prevention)
  • 02:14, 13 June 2004 User:Patrick (→Prevention - New since v.1.4 is CVS-style edit conflict merging, based on the diff3 utility. This feature will only trigger an edit conflict if users attempt to edit the same few lines.)
  • 06:29, 17 April 2004 User:24.156.5.10
  • 03:22, 28 February 2004 User:Merphant m (fix "diff" links)
  • 02:53, 28 February 2004 User:Merphant (paste from Misplaced Pages, with some changes/omissions)

From Meta:Help talk:Edit conflict

One person conflict

"One person conflict" should not be placed so far at the bottom of this page. --User:Jidanni 2006-07-25

Do you have any suggestions, then? --Siva1979 03:05, 2 August 2006 (UTC)

If there are three or more edit conflicts?

I was just wandering what would happen if there are three or more users editing the same page at the same time? Will it still show a two-person edit conflict? --Siva1979 03:09, 2 August 2006 (UTC)


what are the reasons of having one person conflict?

Please I want to know the reasons of having a self personal edit conlict!!! is it the slow speed of the server that allow to save a version and reedit the old one?? is it similar to two edit conflict?

Does anyone have any information about this?? if someone does can you improve the help:Edit conflict to contain informations about the self edit conflict, especially the reasons. Till know i didn't know the reasons of Edit conflict is it the confusion of the system which doesn't know how to merge the simultaneous changes??

another question is how the system does know about a conflict, in other words is there any tool to informe the system that a number of line were changed simulaneous and what is the number of lines detectable by the system??

if two people made changes on the same page in a different paragraph, they should not have an edit conflict isn't???

please it's important to include these informations in the help to let people know about the reasons of a versions conflict in wikipédia and how to solve it. —The preceding unsigned comment was added by 194.126.23.200 (talk • contribs) 14:40, 27 September 2006 (UTC).