apache/spark — pull request #342 by pwendell (2014-04-07 02:55:31+00:00)
Title: 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.