Changes

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]].  

A great way to avoid edit conflicts on talk pages is to communicate off the wiki; see [[instant messaging]], email can also be used.  

[[Category:MediaWiki]]

[[Category:MediaWiki]]