I just upgraded to version 3.4.24 and when I did a Cherry-Pick, I had a conflict. the first file in the list did not have a conflict and that is the file that showed in the preview area.  My view was set to Flat List - no staging.  When I selected the file that had a conflict, the preview did not change and I was unable to select Resolve Conflicts.  I switched the view to Split View Staging and I was able to select the file and select Resolve Conflict.
I then tried to Rebase the branch on another and a blank dialog came up with an OK and Cancel button.  I pressed OK and a message appeared that said "Nope!"