Hi,
Having trawled around the archives of this and some other lists and
searching for a couple of hours, I have read that MediaWiki
automatically merges simple edit-conflicts.
In practice using two separate setups (both Win32 - not my choice,
work only uses windows systems):
* MediaWiki: 1.7.1
* PHP: 5.1.6 (apache2handler)
* MySQL: 5.0.19-community
(apache 2.0.59 win32)
* MediaWiki: 1.6.5
* PHP: 4.4.2 (cgi-fcgi)
* MySQL: 5.0.19-community
(IIS)
..even very basic edits do not auto merge and throw an edit conflict.
By very basic edits I refer to changes made to completely different
lines in a small file.
Is this the intended functionality of this? I find it hard to believe
considering all the "automatic merging" discussion and information I
have seen. If not, why are my basic edits not auto merging? Do I need
to configure anything? Is it related to win32 installation?
Cheers in advance
-Tim