Re: Please squash/cleanup PRs before merge

2025-01-31 Thread Michael Bien
On 12.01.25 14:45, Michael Bien wrote: Not sure if we can make it more strickt without it getting in the way though. Such a check would be a constant reminder for oldschoolers and wouldn't stay in a way, as it could be disabled by adding a special label. If this is mainly about finding ways t

Re: Please squash/cleanup PRs before merge

2025-01-12 Thread Michael Bien
Hi Jaroslav, On 12.01.25 06:52, Jaroslav Tulach wrote: I've noticed there is some commit validation checker as I got one failure during development. Why doesn't the checker: - fail a PR check if there are two commits by the same person? - e.g. two commits by jaroslav.tulach would fail the PR ch

Re: Please squash/cleanup PRs before merge

2025-01-11 Thread Jaroslav Tulach
Please accept my apology for not cleaning up history of my latest PR enough. Not being constantly reminded about the current NetBeans commit policy one forgets and continues to live in the old times... > Worth noting that our commit header checker script which we added after > https://lists.apac

Re: Please squash/cleanup PRs before merge

2025-01-11 Thread Michael Bien
On 08.01.25 21:28, Matthias Bläsing wrote: Hi Chris, Am Mittwoch, dem 08.01.2025 um 21:11 +0100 schrieb Chris: Thx for the headsup. I know that pain but I thought that this is just the button "squash and merge" at github, isn't it? On 08.01.25 17:34, Matthias Bläsing wrote: Cleaningup with g

Re: Please squash/cleanup PRs before merge

2025-01-11 Thread Chris
Hey Matthias, understood and thx for the explamanation :). Cheers Chris Am 08.01.2025 um 21:28 schrieb Matthias Bläsing: Hi Chris, Am Mittwoch, dem 08.01.2025 um 21:11 +0100 schrieb Chris: Thx for the headsup. I know that pain but I thought that this is just the button "squash and merge" a

Handling authorship on squashed PRs (was: Re: Please squash/cleanup PRs before merge)

2025-01-09 Thread Matthias Bläsing
Hi, as there as a inquiry how to handle the situation here is one option: Use the "Co-authored-by" trailer entry, as was done for example here: https://github.com/apache/netbeans/pull/5866/commits/697d0320eaffbd054813a5d0c369bf5ebae47703 -- m

Re: Please squash/cleanup PRs before merge

2025-01-08 Thread Matthias Bläsing
Hi Chris, Am Mittwoch, dem 08.01.2025 um 21:11 +0100 schrieb Chris: > Thx for the headsup. I know that pain but I thought that this is just > the button "squash and merge" at github, isn't it? > > > On 08.01.25 17:34, Matthias Bläsing wrote: > > > > > > Cleaningup with git is not that hard: > >

Re: Please squash/cleanup PRs before merge

2025-01-08 Thread Laszlo Kishalmi
On 1/8/25 12:11, Chris wrote: Thx for the headsup. I know that pain but I thought that this is just the button "squash and merge" at github, isn't it? Well, not really. That method has it's own issues and we disabled that. Cheers Chris Am 08.01.2025 um 18:33 schrieb Michael Bien: +1 che

Re: Please squash/cleanup PRs before merge

2025-01-08 Thread Chris
Thx for the headsup. I know that pain but I thought that this is just the button "squash and merge" at github, isn't it? Cheers Chris Am 08.01.2025 um 18:33 schrieb Michael Bien: +1 checking the PR commits is also part of our PR approval and merge checklists: https://cwiki.apache.org/conflue

Re: Please squash/cleanup PRs before merge

2025-01-08 Thread Michael Bien
+1 checking the PR commits is also part of our PR approval and merge checklists: https://cwiki.apache.org/confluence/display/NETBEANS/PRs+and+You+-+A+reviewer+Guide if the PR isn't squashed properly it either shouldn't get approved, or approved with a request to squash (there is also a label