Details
-
Type:
Bug
-
Status: Closed
-
Priority:
Blocker
-
Resolution: Fixed
-
Affects Version/s: 6.2.3, 6.3
-
Fix Version/s: 7.2-milestone-3, 6.4.5, 7.1.3
-
Component/s: XWiki Enterprise Documents
-
Labels:
-
Documentation:N/A
-
Documentation in Release Notes:N/A
-
Similar issues:
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
-