Resolving rebase/merge conflicts in .sln files hangs Rider
this is tricky to reproduce. you have to setup a merge or rebase conflict in git on the .sln file. and then if you try to resolve the conflicts through rider, using the green >> button, the 3-pane conflict resolution window crashes Rider. I suspect this is related to your new .sln file syntax highlighting, but not sure.
the crash is a sort of messy/hard crash. the window freezes up and stops painting properly. Rider in the background might still be alive, but this window is unresponsive and blocks the rest of Rider, so there's no choice but to kill the Rider process.
this happens pretty reliably when resolving .sln merge/rebase conflicts.
thanks
Please sign in to leave a comment.
Same thing happened to me. Here's how I triggered the issue: Stashed changes that included a change to the sln file, interactive rebase to drop a commit that included a different change to the sln file. Tried to use Rider to resolve the conflict and encountered hang described above. HTH
I have the same issue with Rider 24.2.6, pretty much every time I try to resolve a merge conflict on a .sln file
Hi,
Please see: https://youtrack.jetbrains.com/issue/RIDER-114986
We are aware of this issue and working on it.