Github user srowen commented on the issue:
    Yep, saw that. I re-merged this, and yes during conflict resolution 
QuantileSummaries.scala comes up as a file added only in the master branch, but 
when I choose to not take the change in the IDE, I see it actually resulted in 
adding an empty file. I made sure that was not part of the commit and pushed 
again. Looks as intended now:

If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at or file a JIRA ticket
with INFRA.

To unsubscribe, e-mail:
For additional commands, e-mail:

Reply via email to