Argh, sorry, the "rebase/merge" does not work... Le mar. 22 nov. 2022 à 15:26, Guillaume Nodet <[email protected]> a écrit :
> Yes, good point. One can also explicitly "rebase / merge" if there has > been no commit between the PR and the master branch. > > Le mar. 22 nov. 2022 à 15:19, Slawomir Jaranowski <[email protected]> > a écrit : > >> Hi, >> >> Great work. >> >> Please take care - that commit sha will be changed after rebase PR. Should >> be added at new PR or direct commit. >> >> wt., 22 lis 2022 o 14:43 Guillaume Nodet <[email protected]> napisał(a): >> >> > As discussed in the last weeks, I've pushed an upgrade to maven parent >> 38 >> > which has the new code style enforced. The auto-formatting can be >> enabled >> > using the format profile. >> > >> > The parent POM raises the minimum JDK requirement to JDK 1.8. >> > >> > Note that any component upgrading to the maven parent pom 38 will have >> this >> > code style enforced. I would advise the following when upgrading: >> > * create a commit with just the parent pom change (and related needed >> > changes) >> > * run with the -Pformat option and commit the changes >> > * add a file named .git-blame-ignore-revs containing the sha1 of the >> > previous commit to make sure the git blame works well and ignore the >> > reformat code, see [1] >> > >> > [1] >> > >> > >> https://github.com/apache/maven/commit/001eef8452b38110a2557446aa81b8fb1ff35f92#diff-f247fbfbe928b907db42554d0b3006b28dd11c25a59be031abda73b11a2c934a >> > >> > Cheers, >> > Guillaume >> > >> >> >> -- >> Sławomir Jaranowski >> > > > -- > ------------------------ > Guillaume Nodet > > -- ------------------------ Guillaume Nodet
