[Bug 1.90.1.0] Showing unresolved conflicts as resolved

[Sigeria]

Having .gitattribues as:

* text=auto

# Unity files
*.[mM][eE][tT][aA] -text -merge=unityamlmerge
*.[uU][nN][iI][tT][yY] -text -merge=unityamlmerge
*.[aA][sS][sS][eE][tT] -text -merge=unityamlmerge
*.[pP][rR][eE][fF][aA][bB] -text -merge=unityamlmerge

Trying to merge two files .prefab. Got a message that there is a conflict, Got an icon on file that it's in conflict, but right window says all conflicts are resolved and if I stage conflict file, it will simply be missing from both Staged and Unstaged as if it automatically resolved conflict to my side. And it causes problems

[GorrionMW]

Having similar issues. .meta files during merge are marked as resolved, even though they're not. Conflict tags are in the staged file if you force resolve conflict using either version. This is very difficult to detect and quite annoying

[DanPristupov]

@GorrionMW, did you add anything related to .meta files to .gitattributes?