Hi, > we should just ensure that commits are squashed > and rebased on top of the main/master branch.
We can do this by specifying "squash" to "merge_method" parameter: https://docs.github.com/en/rest/pulls/pulls#merge-a-pull-request https://github.com/apache/arrow/pull/13184/files#diff-4aea0167b68c23bb8725640aec90bfc1d4caed14e9c21e1b64d65a54f9b47e63R265 > (also, the commit title and description should inherit the PR's > corresponding fields) We can do this too because GitHub API has "commit_title" and "commit_message" parameters: https://docs.github.com/en/rest/pulls/pulls#merge-a-pull-request https://github.com/apache/arrow/pull/13184 uses the same content as the current "git merge" approach. So merge result should not be changed. Thanks, -- kou In <0d1351e1-4e7d-be76-c0ca-8d41d215a...@python.org> "Re: Merge a pull request with GitHub API" on Wed, 18 May 2022 10:07:36 +0200, Antoine Pitrou <anto...@python.org> wrote: > > That sounds ok to me, we should just ensure that commits are squashed > and rebased on top of the main/master branch. > > (also, the commit title and description should inherit the PR's > corresponding fields) > > > Le 18/05/2022 à 05:43, Sutou Kouhei a écrit : >> Hi, >> How about using GitHub API instead of local "git merge" to >> merge a pull request? >> We use local "git merge" to merge a pull request in >> dev/merge_arrow_pr.py. >> If we use "git merge" to merge a pull request, GitHub's Web >> UI shows "Closed" mark not "Merged" mark in a pull request >> page. This sometimes confuses new contributors. "Why was my >> pull request closed without merging?" See >> https://github.com/apache/arrow/pull/12004#issuecomment-1031619771 >> for example. >> If we use GitHub API >> https://docs.github.com/en/rest/pulls/pulls#merge-a-pull-request >> to merge a pull request, GitHub's Web UI shows "Merged" mark >> not "Closed" mark. See >> https://github.com/apache/arrow/pull/13180 for example. I >> used GitHub API to merge the pull request. >> And we don't need to create a local branch on local >> repository to merge a pull request. But we must specify >> ARROW_GITHUB_API_TOKEN to run dev/merge_arrow_pr.py. >> See also: >> * https://issues.apache.org/jira/browse/ARROW-16602 >> * https://github.com/apache/arrow/pull/13184 >> Thanks,
