Skip to content

Rescue ConflictSideMissing error

Patrick Bajao requested to merge 364628-fix-fork-conflicts-errors into master

What does this MR do and why?

Gitlab::Git::Conflict::Resolver::ConflictSideMissing error gets raised when we try to list conflicts but the reference from a fork isn't present on canonical repo yet (it happens async).

Before this fix, when this error is raised we're not able to display the diff.

This is part of a feature behind the display_merge_conflicts_in_diff feature flag.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Related to #364628 (closed)

Merge request reports