mridulm edited a comment on pull request #30139: URL: https://github.com/apache/spark/pull/30139#issuecomment-729339566
+CC @srowen, @HyukjinKwon I merged the pr via ./dev/merge_spark_pr.py - but it failed with following [1] When I look at apache repo, the commit has made it through : https://git-wip-us.apache.org/repos/asf?p=spark.git;a=commit;h=f8b95dddc1571194fd728d7e0c6de495895da99e I had run a git fetch -all and git pull before merging. A subsequent pull showed no conflicts with local [2]. Any idea why there is a disconnect between github and apache repo ? Thanks. [1] ``` Merge complete (local ref PR_TOOL_MERGE_PR_30139_MASTER). Push to apache? (y/n): y git push apache PR_TOOL_MERGE_PR_30139_MASTER:master Username for 'https://git-wip-us.apache.org': mridulm80 Password for 'https://[email protected]': Enumerating objects: 26, done. Counting objects: 100% (26/26), done. Delta compression using up to 8 threads Compressing objects: 100% (9/9), done. Writing objects: 100% (14/14), 4.72 KiB | 4.72 MiB/s, done. Total 14 (delta 5), reused 0 (delta 0) remote: To git@github:apache/spark.git remote: ! [rejected] f8b95dddc1571194fd728d7e0c6de495895da99e -> master (fetch first) remote: error: failed to push some refs to 'git@github:apache/spark.git' remote: hint: Updates were rejected because the remote contains work that you do remote: hint: not have locally. This is usually caused by another repository pushing remote: hint: to the same ref. You may want to first integrate the remote changes remote: hint: (e.g., 'git pull ...') before pushing again. remote: hint: See the 'Note about fast-forwards' in 'git push --help' for details. remote: Syncing refs/heads/master... remote: Could not sync with GitHub: remote: Sending notification emails to: [u'"[email protected]" <[email protected]>'] remote: Error running hook: /x1/gitbox/hooks/post-receive.d/01-sync-repo.py To https://git-wip-us.apache.org/repos/asf/spark.git 5e8549973dc..f8b95dddc15 PR_TOOL_MERGE_PR_30139_MASTER -> master git rev-parse PR_TOOL_MERGE_PR_30139_MASTER Restoring head pointer to master git checkout master Switched to branch 'master' git branch Deleting local branch PR_TOOL_MERGE_PR_30139 git branch -D PR_TOOL_MERGE_PR_30139 Deleting local branch PR_TOOL_MERGE_PR_30139_MASTER git branch -D PR_TOOL_MERGE_PR_30139_MASTER Pull request #30139 merged! Merge hash: f8b95ddd ``` [2] ``` $ git pull apache-github master remote: Enumerating objects: 8, done. remote: Counting objects: 100% (8/8), done. remote: Compressing objects: 100% (3/3), done. remote: Total 13 (delta 5), reused 6 (delta 5), pack-reused 5 Unpacking objects: 100% (13/13), 1.63 KiB | 104.00 KiB/s, done. From github.com:apache/spark * branch master -> FETCH_HEAD + f8b95dddc15...7f3d99a8a5b master -> origin/master (forced update) Updating 5e8549973dc..7f3d99a8a5b Fast-forward python/pyspark/sql/functions.py | 4 ++-- sql/core/src/main/scala/org/apache/spark/sql/functions.scala | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ``` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
