Re: Merging via GitHub

2020-05-17 Thread Enrico Olivelli
Olivier Il giorno dom 17 mag 2020 alle ore 04:00 Olivier Lamy ha scritto: > and yeah that's embarrassing > someone mentioned using a script. where is this script? > I have a script that syncs the PR with a local branch. It is very raw so it is not worth to share btw in ZooKeeper community we h

Re: Merging via GitHub

2020-05-17 Thread Sylwester Lachiewicz
Yes, there's too much noisy mails with rebase and too many unnecessary jira comments from build notifications - any idea where and how to fix it? niedz., 17 maj 2020, 01:53 użytkownik Olivier Lamy napisał: > I wonder what is exactly the problem here? (except a noisy commit but who > cares really

Re: Merging via GitHub

2020-05-17 Thread Sylwester Lachiewicz
I prefer to keep who was orginal author of commit (here dependabot service). With almost every commit i'm rebasing it (so I'm commiter) or just git ammend to indicate who merged that change. Sylwester niedz., 17 maj 2020, 03:51 użytkownik Olivier Lamy napisał: > On Sun, 17 May 2020 at 11:40, Da

Re: Merging via GitHub

2020-05-16 Thread Olivier Lamy
and yeah that's embarrassing someone mentioned using a script. where is this script? On Sun, 17 May 2020 at 11:51, Olivier Lamy wrote: > > > On Sun, 17 May 2020 at 11:40, David Jencks > wrote: > >> As a side note, I’m personally in favor of the author squashing manually >> and the “merge” into

Re: Merging via GitHub

2020-05-16 Thread Olivier Lamy
On Sun, 17 May 2020 at 11:40, David Jencks wrote: > As a side note, I’m personally in favor of the author squashing manually > and the “merge” into master using rebase-and-commit. > > To your main issue, I’m pretty sure that GitHub doesn’t keep any secret > information, instead you are using an i

Re: Merging via GitHub

2020-05-16 Thread David Jencks
As a side note, I’m personally in favor of the author squashing manually and the “merge” into master using rebase-and-commit. To your main issue, I’m pretty sure that GitHub doesn’t keep any secret information, instead you are using an insufficiently verbose log command. Try git log --pretty=

Re: Merging via GitHub

2020-05-16 Thread Olivier Lamy
I wonder what is exactly the problem here? (except a noisy commit but who cares really compared to the useless noise email notifications when someone rebase a branch) But at least there are real person name. That's weird because I just used the "Squash and merge' for this PR ( https://github.co

Re: Merging via GitHub

2020-05-12 Thread Tibor Digana
I have checked it out with all three enabled in [1] but i still see the same number of buttons as before. How it should behave? I would like to have the rebase even in the squash but the comment above the "rebase: true" says "button" and not a "behavior" in another buttons e.g, "Squash and merge".

Re: Merging via GitHub

2020-05-12 Thread Hervé BOUTEMY
it can be configured at ASF with .asf.yaml setting: https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories#id-.asf.yamlfeaturesforgitrepositories-Mergebuttons Le mardi 12 mai 2020, 00:45:31 CEST David Jencks a écrit : > It's possible to configure GitHub to allow

Re: Merging via GitHub

2020-05-11 Thread Elliotte Rusty Harold
Could someone who understands Git and what should happen update https://maven.apache.org/developers/conventions/git.html with detailed instructions? I've tried every variation I can imagine and nothing seems to produce the results that are being asked for. Also, if you don't want people to use Mer

Re: Merging via GitHub

2020-05-11 Thread David Jencks
It's possible to configure GitHub to allow rebase and merge, which I think is what you want. It may be possible to configure GitHub to only allow this. I’m not sure if this is something infra has to do or if a project admin can set it up. Camel recently made a related change. David Jencks >

Re: Merging via GitHub

2020-05-11 Thread Tibor Digana
This probably happens when the committer has pressed "Squash and merge". I expect it does not rebase. But when you press "Rebase and merge" then the commits would be rebased on the HEAD but it does not squash the commits to one. So you have to check the parent commit. If it is old then the contrib

Re: Merging via GitHub

2020-05-11 Thread Benson Margulies
Could you send me a pointer to refresh my memory on procedures? It's been a while ... On Mon, May 11, 2020 at 1:42 PM Michael Osipov wrote: > Folks, > > please do NOT merge via merge button in GitHub: > > > commit 158f54e3abc5c1d602146a08902482b6a19e2c27 (origin/master, > origin/HEAD) > > Merge: