On Wed, 4 Aug 2004 20:11:10 -0700, aphid <spam@...> wrote:
> When I use the 'Load & Overwrite' or the standard Upload in the
> phpwikiAdmin page, the oldest version of each page is loaded in and
> then I get this message (often multiple times for oft edited files):
> from MIME file [filename] has edit conflicts - skipped Sorry, cannot
> merge uploaded files.
I'm having the same problem.
I want to try running on the CVS snapshot, but I don't want to dump my
working 1.3.10 instance, so I'm installing the CVS version in a
separate location with a separate MySQL database.
It's running at
...although it's ignoring my "THEME = BlueCrao" (my modified version
of Crao) in config.ini. Anyway.
I clicked the "ZIP Dump" link while logged in as the admin user on my
1.3.10 wiki, then tried the "Upload File" textfield on the CVS
snapshot. I get the same repeated error messages as Aphid:
from MIME file <pagename> has edit conflicts - skipped Sorry, cannot merge.