Github user gatorsmile commented on the issue:
https://github.com/apache/spark/pull/16638
You do not need to do the step 1 every time. You might miss the following
two steps when you want to resolve your conflicts.
> git fetch upstream
> git merge upstream/master
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
