turboFei commented on PR #1274: URL: https://github.com/apache/auron/pull/1274#issuecomment-3309708130
> 1. add remote apache > > ``` > git remote add apache https://github.com/apache/auron.git > ``` > > 2. merge PR and blocked by master branch protection > > ``` > (base) ➜ auron git:(master) ./dev/merge_auron_pr.py > git rev-parse --abbrev-ref HEAD > Which pull request would you like to merge? (e.g. 34): 1274 > > === Pull Request #1274 === > title: [AURON #985] Expect to convert DataWritingCommandExec to NativeParquetSinkExec > source: turboFei/auron_985 > target: master > url: https://api.github.com/repos/apache/auron/pulls/1274 > body: > > # Which issue does this PR close? > > > > Closes #. > > # Rationale for this change > > Take over https://github.com/apache/auron/pull/986 to move forward. > # What changes are included in this PR? > > > # Are there any user-facing changes? > > > > > # How was this patch tested? > > > assignees: ['turboFei'] > > Milestone has NOT been set. Continue? (y/n): y > > Proceed with merging pull request #1274? (y/n): y > git fetch apache pull/1274/head:PR_TOOL_MERGE_PR_1274 > From https://github.com/apache/auron > * [new ref] refs/pull/1274/head -> PR_TOOL_MERGE_PR_1274 > git fetch apache master:PR_TOOL_MERGE_PR_1274_MASTER > From https://github.com/apache/auron > * [new branch] master -> PR_TOOL_MERGE_PR_1274_MASTER > git checkout PR_TOOL_MERGE_PR_1274_MASTER > Switched to branch 'PR_TOOL_MERGE_PR_1274_MASTER' > ['git', 'merge', 'PR_TOOL_MERGE_PR_1274', '--squash'] > Automatic merge went well; stopped before committing as requested > ['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_1274', '--pretty=format:%an <%ae>'] > Enter primary author in the format of "name <email>" [Fei Wang <[email protected]>]: > ['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_1274', '--pretty=format:%h [%an] %s'] > git config --get user.name > git config --get user.email > ['git', 'commit', '--author="Fei Wang <[email protected]>"', '-m', '[AURON #985] Expect to convert DataWritingCommandExec to NativeParquetSinkExec', '-m', '# Which issue does this PR close?\r\n\r\n\r\n\r\nCloses #.\r\n\r\n # Rationale for this change\r\n\r\nTake over https://github.com/apache/auron/pull/986 to move forward.\r\n# What changes are included in this PR?\r\n\r\n\r\n# Are there any user-facing changes?\r\n\r\n\r\n\r\n\r\n# How was this patch tested?\r\n\r\n', '-m', 'Closes #1274 from turboFei/auron_985.', '-m', 'Closes #985', '-m', 'eb47cf16 [Fei Wang] [AURON #985] Expect to convert DataWritingCommandExec to NativeParquetSinkExec', '-m', 'Authored-by: Fei Wang <[email protected]>\nSigned-off-by: Fei Wang <[email protected]>'] > > Merge complete (local ref PR_TOOL_MERGE_PR_1274_MASTER). Push to apache? (y/n): y > git push apache PR_TOOL_MERGE_PR_1274_MASTER:master > Enumerating objects: 41, done. > Counting objects: 100% (41/41), done. > Delta compression using up to 10 threads > Compressing objects: 100% (15/15), done. > Writing objects: 100% (24/24), 2.54 KiB | 2.54 MiB/s, done. > Total 24 (delta 6), reused 0 (delta 0), pack-reused 0 > remote: Resolving deltas: 100% (6/6), completed with 6 local objects. > remote: error: GH006: Protected branch update failed for refs/heads/master. > remote: > remote: - Changes must be made through a pull request. > To https://github.com/apache/auron.git > ! [remote rejected] PR_TOOL_MERGE_PR_1274_MASTER -> master (protected branch hook declined) > error: failed to push some refs to 'https://github.com/apache/auron.git' > Restoring head pointer to master > git checkout master > Switched to branch 'master' > git branch > Deleting local branch PR_TOOL_MERGE_PR_1274 > git branch -D PR_TOOL_MERGE_PR_1274 > Deleting local branch PR_TOOL_MERGE_PR_1274_MASTER > git branch -D PR_TOOL_MERGE_PR_1274_MASTER > Exception while pushing: Command '['git', 'push', 'apache', 'PR_TOOL_MERGE_PR_1274_MASTER:master']' returned non-zero exit status 1. > Restoring head pointer to master > git checkout master > Already on 'master' > git branch > Restoring head pointer to master > git checkout master > Already on 'master' > git branch > (base) ➜ auron git:(master) > ``` cc @FMX @richox -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
