Did you find an answer for this? I'm looking too — I have 1200+ conflicts with this one file I am trying to apply a stash to. I tried to select them all individually (left arrow, down arrow, repeat), but apparently I missed one since it still won't let me apply the changes.

I had the problem with Handoff and Continuity not working between my MacBook Pro and iPhone and fixed it. Turning off Handoff/Wi-Fi/Bluetooth, restarting and turning them on did not work, even when I did it to both devices. I did not want to log out of iCloud since it would take so long to resync all my docs/etc. But when I opened Bluetooth settings on both devices, my iPhone showed up on my Mac and I connected it to pair them. Immediately Handoff and Continuity started working again.