Details
-
Bug
-
Resolution: Fixed
-
Blocker
-
6.2.3, 6.3
-
N/A
-
N/A
-
Description
I got 2 merge conflicts for these pages when doing an upgrade from 6.4.4 to 7.1.1 on Oracle 11.2:
- XWiki.Admin
- Mail.MailConfig
This happened for the main wiki, but also for each subwiki that I upgraded.
Attachments
Issue Links
- is duplicated by
-
XWIKI-12621 Merge conflict for XWiki.Admin when upgrading from default 7.1.2 to default 7.2
- Closed
- relates to
-
XWIKI-12561 Can't compare two XWikiDocument with password property initialized with a clear password anymore
- Open
-
XWIKI-5261 Password hashes dumpable
- Closed