I was facing the same issue in VS 2022 and apparently upgrading to Version 17.12.3 resolved it.

I also added Visual Studio as Diff Tool and Merge Tool by going to Tools > Options > Source Control > Git Global Settings See below picture

https://i.sstatic.net/MB1GXHXp.png