When I adjust the height of the bottom pane ('merged' view) when resolving merge conflicted file, cancel/resolve it, and then open the next merge conflict, the height is reset to some default value.
I actually wouldn't mind this so much if my other issue is resolved where selecting the next conflict or left and/or right version(s) to use in the merged version doesn't center each pane's view of the code on the conflicting line of code (or actually the merged view should probably scroll so that the merged code is closer to the top of the pane (because the rest of the affected code will be below the conflicting line).
[fork: 2.29.2, macOS: 12.6.6]
When I adjust the height of the bottom pane ('merged' view) when resolving merge conflicted file, cancel/resolve it, and then open the next merge conflict, the height is reset to some default value.
I actually wouldn't mind this so much if my other issue is resolved where selecting the next conflict or left and/or right version(s) to use in the merged version doesn't center each pane's view of the code on the conflicting line of code (or actually the merged view should probably scroll so that the merged code is closer to the top of the pane (because the rest of the affected code will be below the conflicting line).
Associated issue: https://github.com/fork-dev/Tracker/issues/1908