## Problem to solve We want to be able to show which type of conflict occurred in a file in https://gitlab.com/gitlab-org/gitlab/-/issues/281171. For some scenarios, like when the file is removed from source/target branch or rename conflicts, one of the sides (ours or theirs) can be missing. Currently the `ListConflictFiles` RPC doesn't return list of conflicts when there's a missing side. It returns an error instead. ## Proposal 1. Make `ListConflictFiles` RPC support returning list of conflicts even if there are missing sides. Right now, it doesn't support it. We need it so we can know which type of conflict occurred for a specific file. This requires changes on Gitaly. 1. Ensure that when consuming the updated `ListConflictFiles` on the gitlab-rails side, that we only show the resolve button for really resolvable conflicts. <!-- triage-serverless v3 PLEASE DO NOT REMOVE THIS SECTION --> *This page may contain information related to upcoming products, features and functionality. It is important to note that the information presented is for informational purposes only, so please do not rely on the information for purchasing or planning purposes. Just like with all projects, the items mentioned on the page are subject to change or delay, and the development, release, and timing of any products, features, or functionality remain at the sole discretion of GitLab Inc.* <!-- triage-serverless v3 PLEASE DO NOT REMOVE THIS SECTION -->