In this case better to keep different commits for each different issues (just in case some need to be reverted)
On Fri, 2 May 2025 at 9:45 pm, Elliotte Rusty Harold <elh...@ibiblio.org> wrote: > Yes, just squash and merge. One approval is all you need. > > We use version control so in a worst case scenario we can always roll > back or revert. More likely if something's wrong we just fix it in a > new PR. Merging is not an irreparable commitment, but 99 times out of > 100 we just merge and continue forward. > > On Thu, May 1, 2025 at 12:22 PM Martin Desruisseaux > <martin.desruisse...@geomatys.com> wrote: > > > > Hello > > > > There is two branches that we could merge, but I would like to > > double-check on this list before to move ahead. > > > > The first pull request (PR) is replacing Plexus dependency by java.nio > > in the maven-clean-plugin. This PR got two reviewers approval, so in my > > understanding I could merge, but I would like to verify if this is a > > correct understanding: > > > > https://github.com/apache/maven-clean-plugin/pull/243 > > > > The second pull request is a refactoring of the maven-compiler-plugin > > (NOT including the module-info-patch proposed in a previous thread - > > that one is kept in a separated branch). While that PR got only one > > approval, I suspect it may be difficult to get more because of the size > > of the changes. The problem is that new developments are added on top of > > this PR instead of on master, for avoiding future merge conflicts. > > Therefore, this PR is slowly growing with new fixes are that not > > directly the initial PR scope. > > > > https://github.com/apache/maven-compiler-plugin/pull/320 > > > > That pull request fixes the following issues as side-effect of the > > refactoring, or with bug fixes added after the initial PR: > > > > * #308 Bump mavenVersion from 4.0.0-rc-2 to 4.0.0-rc-3 > > * #319 Bump > > org.apache.maven.plugin-testing:maven-plugin-testing-harness from > > 4.0.0-beta-3 to 4.0.0-beta-4 > > * #326 API incompatibility when using Maven 4.0.0-RC3 > > * #327 master does not build on windows with Maven 4.0.0-rc-3 > > * #193 Use relative paths in jpms.args to make the builds reproducible > > * #160 This plugin is not "incremental" > > * #27 (under some conditions) fix test compile issue: added dependency > > test path for modules > > * Wrong encoding when reading the output of forked JVM on Windows > > > > Martin > > > > > -- > Elliotte Rusty Harold > elh...@ibiblio.org > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org > For additional commands, e-mail: dev-h...@maven.apache.org > >
