## Problem to solve Within https://gitlab.com/gitlab-org/gitlab/-/issues/267337 we've highlighted conflicts in diff. Displaying a message for each file that has a conflict in diff with a message (ideally with [a class of the conflict](https://gitlab.com/groups/gitlab-org/-/epics/4893#classes-of-conflicts)) would be ideal. ## Proposal Just to illustrate the idea:  File tree can reflect it as well using a different icon for a file with a conflict:  - [Figma exploration 🔗](https://www.figma.com/file/e3kZ1S0Kace7PPR3WETttW/Conflicted-file-in-the-diff?node-id=1%3A2) - [Final design](https://gitlab.com/gitlab-org/gitlab/-/issues/281171/designs/Iteration1_alert.png) ## Implementation proposal Ancestor has been exposed in Conflicts RPC recently: https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2672, so we can calculate based on `our`, `their` and `ancestor`, which class of the conflict we're dealing with. It can be done in https://gitlab.com/gitlab-org/gitlab/-/blob/8507ac1daa0aea71023815520619b9c10f4c1178/lib/gitlab/git/conflict/file.rb#L5 and exposed in https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/serializers/diff_file_entity.rb <!-- 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 -->