Patrick Wendell created SPARK-1431:
--------------------------------------
Summary: Allow merging pull requests that have conflicts
Key: SPARK-1431
URL: https://issues.apache.org/jira/browse/SPARK-1431
Project: Spark
Issue Type: New Feature
Components: Project Infra
Reporter: Patrick Wendell
Assignee: Patrick Wendell
Fix For: 1.0.0
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.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
