diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-04-06 21:04:45 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-06 21:04:45 -0700 |
| commit | 87d0928a3301835705652c24a26096546597e156 (patch) | |
| tree | baa8fd7ab659c053e837ae4ed47830e68152f8a2 /project | |
| parent | 1440154c27ca48b5a75103eccc9057286d3f6ca8 (diff) | |
| download | spark-87d0928a3301835705652c24a26096546597e156.tar.gz spark-87d0928a3301835705652c24a26096546597e156.tar.bz2 spark-87d0928a3301835705652c24a26096546597e156.zip | |
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.
Author: Patrick Wendell <pwendell@gmail.com>
Closes #342 from pwendell/merge-conflicts and squashes the following commits:
cdce61a [Patrick Wendell] SPARK-1431: Allow merging conflicting pull requests
Diffstat (limited to 'project')
0 files changed, 0 insertions, 0 deletions