GitHub user pwendell opened a pull request:
https://github.com/apache/spark/pull/342
SPARK-1431: Allow merging conflicting pull requests
Sometimes if there is a small conflict it's nice to be able to just
manually fix it up rather than have another RTT with the contributor.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/pwendell/spark merge-conflicts
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/spark/pull/342.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #342
----
commit cdce61a54530412a81a47211356c03064c61ea03
Author: Patrick Wendell <pwend...@gmail.com>
Date: 2014-04-07T02:46:11Z
SPARK-1431: Allow merging conflicting pull requests
Sometimes if there is a small conflict it's nice to be able to just
manually fix it up rather than have another RTT with the contributor.
----
---
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.
---
