Branch: refs/heads/perf/reuse-merge-result-for-conflict-status Home: https://github.com/xwiki-contrib/application-changerequest Commit: d82d94a21ada6951f234c9a4a90af956eb645999 https://github.com/xwiki-contrib/application-changerequest/commit/d82d94a21a... Author: Simon Urli <[email protected]> Date: 2026-09-14 (Mon, 14 Sep 2026) Changed paths: M application-changerequest-default/src/main/java/org/xwiki/contrib/changerequest/internal/DefaultChangeRequestMergeManager.java M application-changerequest-default/src/test/java/org/xwiki/contrib/changerequest/internal/DefaultChangeRequestMergeManagerTest.java Log Message: ----------- [Misc] Reuse the merge document result to compute the file change conflict status * Compute the merge document result and the conflict status of a file change together, and record both in the cache, instead of performing an independent merge for each of them. * Resolve the previous version of an edition once, in the caller, and pass it to the method building the merge document result. Displaying a change request computes the merge document result of every modified document, then checks the conflicts of the change request: both ended up merging the same file changes, since getMergeDocumentResult only filled the merge result cache and hasConflict only filled the conflict status cache. The conflict status keeps its previous meaning: an edition whose previous published version cannot be found anymore is still reported as conflicting, even though a diff is computed against the current version, so that the sheet keeps distinguishing a change request that conflicts from one that needs to be refreshed first. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]> To unsubscribe from these emails, change your notification settings at https://github.com/xwiki-contrib/application-changerequest/settings/notifica...