search

GitFiend / Support

Public repo for GitFiend questions and issues
117 stars 7 forks source link

Merge conflict view issue - Release 0.37.2 #138

Closed manjunathav closed 1 year ago

manjunathav commented 2 years ago

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

GitFiend commented 2 years ago

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.

dev-rfc commented 1 year ago

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.

GitFiend commented 1 year ago

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

GitFiend commented 1 year ago

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 commented 1 year ago

This should now be fixed in v0.39.4