[abdusco]

If you're using JetBrains products, you can view the history of the changes for the whole project and revert mistakes by right-clicking the project > Show Local Changes.

https://twitter.com/abdusdev/status/1403050600925962247

[GordonS]

I use Rider, and this has saved me multiple times!

JetBrains IDEs also have the best UI I've come across for conflict merges.