conflicts: Use resolved object IDs
In conflictFilesWithGitMergeTree
we replace the commit OID with the
filename. Currently, we're using the OID from the request, but this could
be the shortened OID. Let's instead use the fully resolved OID.
Should fix Gitlay update on rails: gitlab!122338 (closed)
In the MR (https://gitlab.com/gitlab-org/gitaly/-/merge_requests?scope=all&state=merged&author_username=knayakgl+) I tested against bundle exec rspec spec/lib/gitlab/git/conflict
tests but missed out spec/lib/gitlab/conflict
. I made sure to test the entire spec/lib
folder this time to ensure I didn't miss anything else
Edited by Karthik Nayak