I adapted this to master. What I do is
1. pull master 2. create a local branch based on master e.g. WICKET-6950-master 3. I cherry-pick commit there. 4. I fix compile errors + check all is building 5. commit changes 6. rebase + squash commit into one with the same message I used for wicket-9.x 7. I merge this to master and push. This way all looks "the same" as for wicket-9.x. I always try to use only one commit per ISSUE and to rebase so noise is minimum. I always create PRs and ask for reviews: to let people smarter than me spot any mess I could introduce. Cheers On Wed, Feb 2, 2022 at 8:48 AM Martin Grigorov <mgrigo...@apache.org> wrote: > On Wed, Feb 2, 2022 at 3:35 PM Ernesto Reinaldo Barreiro < > reier...@gmail.com> > wrote: > > > I haven't cherry-picked my PR for web sockets to mater yet... because I > > think cherrypick will not work as in master we are using Jakarta API > > instead of JAVAX. > > > > Right! > The cherry-picking will fail with merge conflicts which you will have to > resolve, then git add, git commit && git push. > > > > > > > On Wed, Feb 2, 2022 at 7:46 AM Martin Grigorov <mgrigo...@apache.org> > > wrote: > > > > > On Wed, Feb 2, 2022 at 1:34 PM Thomas Heigl <tho...@umschalt.com> > wrote: > > > > > > > Hi, > > > > > > > > My PR is merged as well. It only needs to be back-ported to 9.x. > > > > > > > > Martin, how do you usually do the back-porting? Simply cherry-pick > the > > > > commit? > > > > > > > > > > Yes! > > > git cherry-pick -x [hash] > > > > > > > > > > > > > > > > > Best, > > > > > > > > Thomas > > > > > > > > On Tue, Feb 1, 2022 at 6:28 PM Andrea Del Bene <an.delb...@gmail.com > > > > > > wrote: > > > > > > > > > On Tue, Feb 1, 2022 at 6:24 PM Thomas Heigl <tho...@umschalt.com> > > > wrote: > > > > > > > > > > > Hi, > > > > > > > > > > > > I just created one minor performance related PR: > > > > > > > > > > > > https://github.com/apache/wicket/pull/497 > > > > > > > > > > > > If we can wait one more day, I'd like to see it included in > 9.8.0. > > > > > > > > > > > > > > > > +1 me too! > > > > > > > > > > > > > > > > > > > > > > Best, > > > > > > > > > > > > Thomas > > > > > > > > > > > > On Tue, Feb 1, 2022 at 1:45 PM Ernesto Reinaldo Barreiro < > > > > > > reier...@gmail.com> > > > > > > wrote: > > > > > > > > > > > > > Hi, > > > > > > > > > > > > > > On Sat, Jan 29, 2022 at 6:27 AM Andrea Del Bene < > > > > an.delb...@gmail.com> > > > > > > > wrote: > > > > > > > > > > > > > > > I see there's WICKET-6950 in progress, so I will wait for it > to > > > be > > > > > > > > finished, ok? > > > > > > > > > > > > > > > > > > > > > > Thanks for waiting. WICKET-6950 has landed in the 9.x branch. > > From > > > my > > > > > > side > > > > > > > we are ready to go. > > > > > > > > > > > > > > Thanks for taking care of releases! > > > > > > > > > > > > > > -- > > > > > > > Regards - Ernesto Reinaldo Barreiro > > > > > > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > Andrea Del Bene. > > > > > Apache Wicket committer. > > > > > > > > > > > > > > > > > > -- > > Regards - Ernesto Reinaldo Barreiro > > > -- Regards - Ernesto Reinaldo Barreiro
