Github user srowen commented on the pull request:
https://github.com/apache/spark/pull/5786#issuecomment-101554493
@FavioVazquez Other conflicting changes have been merged to `master` since
this was opened, which is why Github says "This pull request contains merge
conflicts that must be resolved.". Basically you need to pull the latest
`master` changes and `rebase` on it. Are you familiar with that process? I have
a remote `origin` for my fork and `upstream` for the main project and so
usually do ...
```
git checkout master
git pull upstream master
git checkout mybranch
git rebase master
```
You have to fix the merge conflicts and `git push origin mybranch` then.
@vanzin still disagree on the effective POM stuff; you're all correct about
what should happen, but this happened in reality:
https://repo1.maven.org/maven2/org/apache/spark/spark-core_2.10/1.3.1/spark-core_2.10-1.3.1.pom
```
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>2.2.0</version>
...
```
That was what I'm getting at; this shouldn't change backwards now. Whether
or not that is a point doesn't matter though if we're on board with proceeding.
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
