Github user JoshRosen commented on the pull request:
https://github.com/apache/spark/pull/1613#issuecomment-50299937
Hi @miccagiann,
Until it's merged, this pull request will be automatically updated to
contain any commits added to the branch that you opened it from. It looks like
you've opened this PR from the master branch of your repository and
accidentally included some unwanted commits. I'd recommend closing this pull
request, creating a new topic branch in your repository that contains only the
commits that you want to be included in the pull request, and opening a new
pull request based off that branch (you might find GitHub's ["Using pull
requests"](https://help.github.com/articles/using-pull-requests) guide to be
helpful).
I like to keep my `master` branch in sync with the `apache/spark`
repository and do my work in topic branches based off of it. To migrate from
your current repository state to this workflow, I'd try doing something like
this:
```bash
git fetch apache # Fetch the latest commits from the upstream Spark repo
# (might be named something other than 'apache')
git checkout master
git checkout -b old-master # Create a new branch pointing to the current
master, so we don't lose those commits.
git checkout master # Switch back to your master branch
git reset --hard apache/master # Force-reset your master branch to match
the apache master branch
git checkout -b my-feature-branch # Create a new branch to develop your
pull request in
```
Now you should be on `my-feature-branch`. Normally, you'd make commits
against this feature branch, but in this case we want to grab some of the
commits from your old master branch and apply them here. You can do that with
`cherry-pick`:
```bash
git log old-master # List the commits in your old branch
git cherry-pick sha-of-commit-you-want
```
Now, `my-feature-branch` should be in a good state, containing only the
commits you want, and you should be able to push it to GitHub and open a new PR.
---
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.
---
