Siteadmin, Check users, nsTeam1RO, nsTeam1RW, nsTeam1_talkRO, nsTeam1_talkRW, oversight, Administrators
30,650
edits
Changes
Jump to navigation
Jump to search
Line 10:
Line 10: + +
communicate off the wiki; see instant messaging
In practice, manual [[merging]] is not always necessary as the [[Conservapedia]] system is able to resolve many potential edit conflicts automatically, if the edits were made to different paragraphs or sections of a page. The edit conflict page normally only appears when two people were editing the same few lines and automatic merging cannot tell which words or lines to save.
In practice, manual [[merging]] is not always necessary as the [[Conservapedia]] system is able to resolve many potential edit conflicts automatically, if the edits were made to different paragraphs or sections of a page. The edit conflict page normally only appears when two people were editing the same few lines and automatic merging cannot tell which words or lines to save.
A great way to avoid edit conflicts on talk pages is to communicate off the wiki; see [[instant messaging]].
[[Category:MediaWiki]]
[[Category:MediaWiki]]