Support icon indicating copy to clipboard operation
Support copied to clipboard

Published 20 hours ago • verified publisher icon GitFiend

Merge conflict view issue - Release 0.37.2

Open manjunathav opened this issue 2 years ago • 1 comments

Merge conflict view shows empty in left and right side views.

manjunathav avatar Oct 10 '22 16:10 manjunathav

Thanks for letting me know. I have seen this happen to someone else once before but it's not happened to me. Any more details on how to reproduce it reliably would be really helpful.

GitFiend avatar Oct 12 '22 00:10 GitFiend

Thanks for letting me know. I have seen this happen to someone else once before but it's not happened to me. Any more details on how to reproduce it reliably would be really helpful.

Force a conflict with a binary file and it should trigger the bug. Also, clicking on "Abort Merge" returns that there is nothing to merge, only option is click to "Save file" and will make a corrupt binary because both have been merged.

dev-rfc avatar Jan 17 '23 02:01 dev-rfc

Thanks, I'll take a look at this soon.

GitFiend avatar Jan 18 '23 00:01 GitFiend

I've just released a beta with a fix for this when the file is an image (https://gitfiend.com/all-downloads). I'll look into non-image binaries next.

GitFiend avatar Jan 29 '23 05:01 GitFiend

This should now be fixed in v0.39.4

GitFiend avatar Feb 14 '23 21:02 GitFiend