Github user olarayej commented on the pull request:
https://github.com/apache/spark/pull/8984#issuecomment-155161252
@shivaram @felixcheung
I followed the same steps described by @shivaram.
What's confusing for us is that every time we run a fetch followed by a
merge, it triggers conflicts with a number of files that we haven't modified
(even outside the R folder). After I solved all conflicts, and ran a push, it
also pushed those files. Now there are 194 modified files, which makes things
pretty messy.
I'm thinking about creating a new branch and discard this one. Thoughts?
---
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
