MediaWiki:Explainconflict
From PeacockWiki
(Difference between revisions)
| Revision as of 02:00, 12 December 2005 (edit) MediaWiki default (Talk) ← Previous diff |
Current revision (03:36, 1 July 2006) (edit) MediaWiki default (Talk) |
||
| Line 1: | Line 1: | ||
| - | Someone else has changed this page since you | + | Someone else has changed this page since you started editing it. |
| - | started editing it. | + | |
| The upper text area contains the page text as it currently exists. | The upper text area contains the page text as it currently exists. | ||
| Your changes are shown in the lower text area. | Your changes are shown in the lower text area. | ||
| You will have to merge your changes into the existing text. | You will have to merge your changes into the existing text. | ||
| <b>Only</b> the text in the upper text area will be saved when you | <b>Only</b> the text in the upper text area will be saved when you | ||
| - | press "Save page". | + | press "Save page".<br /> |
| - | <p> | + | |
Current revision
Someone else has changed this page since you started editing it.
The upper text area contains the page text as it currently exists.
Your changes are shown in the lower text area.
You will have to merge your changes into the existing text.
Only the text in the upper text area will be saved when you
press "Save page".
