Branch: refs/heads/perf/dedupe-conflict-merge-computation Home: https://github.com/xwiki-contrib/application-changerequest Commit: 839790a38850cb4342a4cccff1b5cfec8b660c9b https://github.com/xwiki-contrib/application-changerequest/commit/839790a388... Author: Simon Urli <[email protected]> Date: 2026-07-31 (Fri, 31 Jul 2026) Changed paths: M application-changerequest-default/src/main/java/org/xwiki/contrib/changerequest/internal/DefaultChangeRequestMergeManager.java M application-changerequest-default/src/main/java/org/xwiki/contrib/changerequest/internal/cache/MergeCacheManager.java M application-changerequest-default/src/test/java/org/xwiki/contrib/changerequest/internal/DefaultChangeRequestMergeManagerTest.java Log Message: ----------- [Misc] Avoid recomputing merges already resolved when checking file change conflicts ChangeRequestMergeDocumentResult#hasConflicts() already carries the exact conflict status computed by getMergeDocumentResult(FileChange). Reuse it in hasConflict(FileChange) instead of re-running an independent 3-way merge, which previously duplicated the merge cost for every conflicting file change checked when displaying a change request (once per merge result computation, once more per conflict check). The now-dead hasConflictCache and its bookkeeping in MergeCacheManager are removed. Co-Authored-By: Claude Sonnet 5 <[email protected]> To unsubscribe from these emails, change your notification settings at https://github.com/xwiki-contrib/application-changerequest/settings/notifica...