Updating branches across code formatting isn't bad if you run the formatter on the repo on your branch prior to updating, then you can merge the formatted target branch into your branch cleanly.
On Wed, Nov 15, 2023, at 12:52, Matt Sicker wrote: > We have our great deletion branch I started to collaborate with you, though I > can merge that beforehand. > > > On Nov 15, 2023, at 1:53 AM, Piotr P. Karwasz <piotr.karw...@gmail.com> > > wrote: > > > > Hi all, > > > > On Wed, 8 Nov 2023 at 09:05, Volkan Yazıcı <vol...@yazi.ci> wrote: > >> Piotr, it has been two months or so since we are discussing this. No > >> objections so far. Please go ahead and implement this. It will help a lot > >> for sync'ing `2.x` and `3.x`. > > > > Since Logging Parent 10.4.0 has been published, I plan to reformat > > `main` this weekend (branch `2.x` will be reformatted before the > > 2.22.0 release). > > > > Do you have any long outstanding branches, which were not already > > merged into the code? Reformatting will render merging or rebasing > > very frustrating. Can you rebase them now on the current `main`? > > > > Piotr
