Details
-
Type:
Bug
-
Status: Closed
-
Priority:
Major
-
Resolution: Duplicate
-
Affects Version/s: 5.2
-
Fix Version/s: None
-
Component/s: Old Core
-
Labels:None
-
Difficulty:Unknown
-
Similar issues:
Description
Steps to reproduce:
- Create a XEM 5.1. No need for workspacetemplate or other subwikis
- Modify the Main.WebHome title to "My Custom HomePage Title"
- Replace the WAR with 5.2 and use the DW to upgrade.
You will get no merge conflict, but the resulting title of Main.WebHome is "My Custoxe.home.title') H".
So to recap:
version | value |
---|---|
5.1 | $services.localization.render('manager.homepage.title') |
database | My Custom HomePage Title |
5.2 | $services.localization.render('xe.home.title') |
merge result | My Custoxe.home.title') H |
Images attached
Attachments
Issue Links
- duplicates
-
XCOMMONS-484 Silent conflict merge when diff between previous/next is not at the exact same indices than in previous/current diff
-
- Closed
-