Github user rxin commented on the pull request:
https://github.com/apache/spark/pull/7331#issuecomment-120555904
Actually couldn't merge. Not sure what's going on.
```
Proceed with merging pull request #7331? (y/n): y
git fetch apache-github pull/7331/head:PR_TOOL_MERGE_PR_7331
git fetch apache master:PR_TOOL_MERGE_PR_7331_MASTER
git checkout PR_TOOL_MERGE_PR_7331_MASTER
error: you need to resolve your current index first
Traceback (most recent call last):
File "./merge_spark_pr.py", line 331, in <module>
merge_hash = merge_pr(pr_num, target_ref)
File "./merge_spark_pr.py", line 109, in merge_pr
run_cmd("git checkout %s" % target_branch_name)
File "./merge_spark_pr.py", line 80, in run_cmd
return subprocess.check_output(cmd.split(" "))
File "/Users/rxin/anaconda/lib/python2.7/subprocess.py", line 573, in
check_output
raise CalledProcessError(retcode, cmd, output=output)
subprocess.CalledProcessError: Command '[u'git', u'checkout',
u'PR_TOOL_MERGE_PR_7331_MASTER']' returned non-zero exit status 1
```
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
