Github user srowen commented on the issue:
https://github.com/apache/spark/pull/22893
There's no merge conflict right now. You can just update the file and push
the commit to your branch. If there were a merge conflict, you'd just rebase on
apache/master, resolve the conflict, and force-push the branch.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
