Render conflicted files differently in diffs
Problem to solve
Within #267337 (closed) 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) 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:
Implementation proposal
Ancestor has been exposed in Conflicts RPC recently: gitaly!2672 (merged), 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
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.