Merge failed with "Unexpected diff result returned: '2'"

Description

I’m attempting to update my current branch from master, using the “Branch→Update from Master” menu item.

When I click this, it identifies two conflicting files. I’ve edited these in an external editor to remove the conflicts, and when I return to Github Desktop I see

Resolve conflicts before merging master into mybranch [tick] All conflicts resolved

When I click “Commit merge”, I see

Error [!] Unexpected diff result returned: ‘2’

When I click “Close”, I’m back to the “All conflicts resolved” screen; I end up in a loop until I abort the merge.

After aborting the merge, I’m able to commit my changes and push to origin; here’s the commit.

Version

• GitHub Desktop: 1.5.1

• Operating system: Microsoct Windows [10.0.17134.472]

Additional Information

I don’t have Folder Redirection enabled, to my knowledge.

Logs

2019-01-09.desktop.production.log

[ms609]

Hi @outofambit , thanks for looking into this. Yes, “mybranch” = “contour”. The SHA would have been 6598bae3dc3d78e214d72c55115899c2274873b1 as you said.

LFS is an interesting suggestion, though no files that match the pattern in .gitattributes (i.e. \inst\doc\*) would have been changed at any point, as far as I can see.

No binary files seem to have been involved in the diff or update, though there are two uncommitted binary files that should not have been affected by the merge; they were there before and after the merge. Do let me know if there’s any more information I can supply.

[WojTherapy]

Same issue here guys.