FamilySearch Wiki:FAQ/Technical: Difference between revisions

FamilySearch Wiki:FAQ/Technical (view source)

1 byte removed , 4 October 2011

no edit summary

22,523

edits

@@ Line 5: / Line 5: @@
 == What happens if two or more people are editing the same page?  ==
-:When the second person (and later persons) attempts to save the page, MediaWiki will attempt to merge their changes into the current version of the text. If the merge fails then the user will receive an "edit conflict" message, and the opportunity to merge their changes manually. If multiple consecutive conflicts are noticed, it will generate a slightly different message. This is similar to Concurrent Versions System (CVS), a widely used software version management system.
+:When the second person (and later persons) attempts to save the page, the Wiki will attempt to merge their changes into the current version of the text. If the merge fails then the user will receive an "edit conflict" message, and the opportunity to merge their changes manually. If multiple consecutive conflicts are noticed, it will generate a slightly different message. This is similar to Concurrent Versions System (CVS), a widely used software version management system.
 == How do I recover a password I have forgotten?  ==