Skip to content

Instantly share code, notes, and snippets.

@rmetzger
Created June 20, 2014 18:52
Show Gist options
  • Save rmetzger/cf4d2eba940483d704a2 to your computer and use it in GitHub Desktop.
Save rmetzger/cf4d2eba940483d704a2 to your computer and use it in GitHub Desktop.
Spark ASF-GitHub-Integration merge tool output
./merge_pull_request.sh
Which pull request would you like to merge? (e.g. 34): 30
=== Pull Request #30 ===
title Added Version and Revision of Stratosphere in Webinterface
source JonathanH5/wi_version
target master
url https://api.github.com/repos/apache/incubator-flink/pulls/30
Proceed with merging pull request #30? (y/n): y
remote: Counting objects: 17, done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 17 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (17/17), done.
From https://github.com/apache/incubator-flink
* [new ref] refs/pull/30/head -> PR_TOOL_MERGE_PR_30
From https://git-wip-us.apache.org/repos/asf/incubator-flink
* [new branch] master -> PR_TOOL_MERGE_PR_30_MASTER
Switched to branch 'PR_TOOL_MERGE_PR_30_MASTER'
Automatic merge went well; stopped before committing as requested
Merge complete (local ref PR_TOOL_MERGE_PR_30_MASTER). Push to flink? (y/n): y
Counting objects: 17, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (13/13), done.
Writing objects: 100% (17/17), 2.49 KiB | 0 bytes/s, done.
Total 17 (delta 9), reused 0 (delta 0)
To https://git-wip-us.apache.org/repos/asf/incubator-flink.git
cd665b9..191dd1d PR_TOOL_MERGE_PR_30_MASTER -> master
Restoring head pointer to b692b049
Note: checking out 'b692b049'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b new_branch_name
HEAD is now at b692b04... Fixed JSON Bug for some plans.
Deleting local branch PR_TOOL_MERGE_PR_30
Deleting local branch PR_TOOL_MERGE_PR_30_MASTER
Pull request #30 merged!
Merge hash: 191dd1d2
Would you like to pick 191dd1d2 into another branch? (y/n): n
Would you like to update an associated JIRA? (y/n): y
Enter a JIRA id []: FLINK-946
ASF JIRA could not find FLINK-946
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment