On the frontend PRs we use the "Squash and merge" button on github but have git config setup to sign commits etc.
On Fri, Nov 21, 2025 at 9:39 AM Marton Szasz <[email protected]> wrote: > On MiNiFi C++, I usually use this script I developed over time: > > https://github.com/szaszm/verify-nifi-release/blob/master/bin/minificpp-merge-pr.sh > > On NiFi, I followed the same steps manually for my recent commit. > > - look up pull request by id using the github API > - get the author, title and description from the pull request > - rebase the PR branch to main > - squash merge to main (roughly equivalent to a cherry-pick for single > commits) > - set author and commit message based on info from the PR > - signoff, GPG sign > - push to github (not git-*.apache.org) > > Marton > > On 11/21/25 3:26 PM, Michael Moser wrote: > > I'm writing to ask NiFi committers about their current best practice for > > committing PRs to git. What process do you use? > > > > I admit I use a very old command-line process to commit, based on the > > Contributor Guide [1], including manual squash, cherry-pick to main, push > > to git-wip-us.apache.org. There has to be a better way now. > > > > [1] - > > > https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide#ContributorGuide-CodeReviewProcess > > > > Thanks, > > -- Mike >
