Updating with auto merge causes severe errors in updated instance

Help / Discuss
1

Hi all,

I’d like to understand a recurring problem I have with the auto-merge option during upgrades.

When I use auto-merge to resolve conflicts in one go, the instance ends up broken once it boots into the new version. Several features fail to load with permission-related errors, and in some cases the Admin Panel disappears entirely. The only way to get a clean, working instance is to go back and resolve every single conflict manually on each upgrade, which defeats the purpose of auto-merge.

This happens independently of the XWiki version, so I assume it’s something about how auto-merge works in itself rather than a version-specific bug.

My questions:

  1. How is auto-merge meant to be used, and what is the mechanism behind it?
  2. What could be the possible reasons for this problem?

Best regards,
Hisham

1 Like
2

@vmassol @acotiuga
Could you please help us with this query?

Thank you in advance!

3

Hello. Maybe https://extensions.xwiki.org/xwiki/bin/view/Extension/Extension%20Manager%20Application#HConflictresolution can help?

When a conflict happens, please use the conflict UI to check the differences and you can paste here if you don’t understand it.

Note that you should also check if you have any local differences in the XS Flavor. To do that → https://extensions.xwiki.org/xwiki/bin/view/Extension/Extension%20Manager%20Application#HComputeChanges

Hope it helps