Description

Github desktop has been reporting "there will be conflicting files after this merge" incorrectly in my last few merges. This makes us think there will be merge conflicts, but then we go ahead and proceed with the merge, which goes fine and no conflicts arise from it after all.

Version

• GitHub Desktop: 1.4.0

• Operating system: OS X 10.11.6

Steps to Reproduce

I don't know under what circumstances this happens, as I have seen this new feature work correctly before, but the last few times it happened, all I tried to do was to merge some commits from the master branch back into some feature branches. I did this for 2 different feature branches in 2 different repos, and it happened all 4 times.

Expected Behavior

For there to be no warning, as there were no merge conflicts.

Actual Behavior

A warning is displayed which is confusing, as there are no actual conflicts after the merge.

Additional Information

I did some additional merges, and actually found the opposite happened too. I initiated a merge, it told me there would be no merge conflicts, but then after the merge, conflicts appeared after all.

Logs

There was no additional information in the logs.