You're probably better off with a rebase.
On Wed, Apr 2, 2014 at 5:05 PM, velvia <[email protected]> wrote: > Github user velvia commented on the pull request: > > https://github.com/apache/spark/pull/288#issuecomment-39399074 > > @pwendell I did a `git merge master` and for some reason it didn't > display as a merge..... :( must have gotten confused about multiple > remotes. > > > --- > 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. > --- >
