There are 10 updates, 1 comment.
 
 
XWiki Platform / cid:jira-generated-image-avatar-05eb3d7a-837b-431f-8d87-7017366b20a3 XWIKI-12620 Closed

Possible overflow in message upon conflict when upgrading

 
View issue   ยท   Add comment
 

10 updates

 
cid:jira-generated-image-avatar-86686a1e-3691-48e0-abac-b20b0936123e Changes by Charpentier Lucas on 02/Oct/25 13:36
 
Documentation in Release Notes: N/A
Documentation: N/A
Description: When upgrading from 7.1.2 to 7.2 I got a merge conflict for XWiki.Admin and the text is oveflowing, see screenshot
!Distribution__XWiki_Distribution__-_XWiki.png|thumbnail!
Attachment: Screenshot from 2025-10-02 13-34-21.png
Attachment: screenshot-1.png
Attachment: Screenshot from 2025-10-02 13-38-32.png
Assignee: Charpentier Lucas
Resolution: Solved By
Status: Open Closed
Labels: bugfixingday
 
 

1 comment

 
cid:jira-generated-image-avatar-86686a1e-3691-48e0-abac-b20b0936123e Charpentier Lucas on 02/Oct/25 13:43
 

It seems that the UI changed a bit here since then.
_thumb_44222.png

AFAIU, it wouldn't overflow anymore. I checked the style and it pointed me easily to
https://github.com/xwiki/xwiki-platform/commit/6ffbb7ebfabc28b134004983e8755846281bb6a1

It seems this problem was fixed in 2018.