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 somet
+1
-Original Message-
From: Sutou Kouhei
Sent: Wednesday, May 18, 2022 11:43 AM
To: dev@arrow.apache.org
Subject: Merge a pull request with GitHub API
Hi,
How about using GitHub API instead of local "git merge" to merge a pull request?
We use local "git merge" to
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
Just a small comment here - (friendly comment from a visitor :). If
you are following squash & rebase workflow - in Apache Airflow we
exclusively merge with GitHub UI's merge.
You can configure .asf.yml to only allow "squash & rebase" and then
squashing and rebasing happens automatically when you
I like the idea. As a new contributor is something that also confused me.
It also has the side effect of easily identifying PRs that have been merged
vs PRs that have been closed without merging which require some more
investigation with the current workflow.
On Wed, May 18, 2022 at 10:16 AM Jarek
One of the benefits of the current merge script is that the PR
description is preserved (maybe this could be possible with this
method) — authors and co-authors are preserved by the explicit
by-lines, e.g.
Lead-authored-by: Nic Crane
Co-authored-by: Ian Cook
Signed-off-by: Ian Cook
I assume th
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>
Hi,
Thanks for the information! We enable only "squash" merge by
https://issues.apache.org/jira/browse/INFRA-17869 but we
should use .asf.yml when need to change it.
Thanks,
--
kou
In
"Re: Merge a pull request with GitHub API" on Wed, 18 May 2022 10:16:17 +0200,
/13184 .
The commit includes Authored-by: and Signed-off-by:. Other
trailers are also included if needed. Because
https://github.com/apache/arrow/pull/13184 still uses the
same logic as the current "git merge" approach.
Thanks,
--
kou
In
"Re: Merge a pull request with GitHub API
Hi,
Do you have any objections to this? If nobody objects this,
I'll merge this in next week.
Thanks,
--
kou
In <20220518.124328.1547483441605263532@clear-code.com>
"Merge a pull request with GitHub API" on Wed, 18 May 2022 12:43:28 +0900
(JST),
Sutou Kouhei w
this,
> I'll merge this in next week.
>
>
> Thanks,
> --
> kou
>
> In <20220518.124328.1547483441605263532....@clear-code.com>
> "Merge a pull request with GitHub API" on Wed, 18 May 2022 12:43:28
> +0900 (JST),
> Sutou Kouhei wrote:
>
Hi,
There are no objections. I've merged this:
https://github.com/apache/arrow/pull/13184
Thanks,
--
kou
In <20220525.061541.194737838528371525@clear-code.com>
"Re: Merge a pull request with GitHub API" on Wed, 25 May 2022 06:15:41 +0900
(JST),
Sutou Kouhei
12 matches
Mail list logo
