When resolving a conflict during cherry picking it is not possible to select between the two versions to resolve

fork-dev / TrackerWin

Bug and issue tracker for Fork for Windows

461 stars 10 forks source link

When resolving a conflict during cherry picking it is not possible to select between the two versions to resolve #2371

Open biggik opened 1 day ago

biggik commented 1 day ago

This happens when one branch has a lot of changes - the change list pushes the button out of view and there is no way to press it See image for details

biggik commented 1 day ago

"No way" as in the UI I mean :) - it is, of course, possible to right click on the file and choose which version to use