Post pylint 3.0.3

[jacobtylerwalls]

@Pierre-Sassoulas let me know how this looks, I'm eager to learn the blessed way of doing this. Do you generally fixup the second commit removing the fragments into the merge commit? When I attempted doing that, I was presented with a long list of rebase merge conflicts for all the caboose commits before the patch release commit.

Or, will we squash merge this anyway?

[jacobtylerwalls]

Or should I push to maintenance/3.0.x instead of pushing to a fresh branch?

[codecov]

Codecov Report

Merging #9299 (4860b82) into main (3d5bd53) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #9299   +/-   ##
=======================================
  Coverage   95.81%   95.81%           
=======================================
  Files         173      173           
  Lines       18767    18767           
=======================================
  Hits        17981    17981           
  Misses        786      786           

[jacobtylerwalls]

I guess we can't squash merge because then we'd lose the commit we need for pre-commit autoupdate, which was the whole point of doing it this way instead of #9297.

Anyway, long story short, I'd very much appreciate as a precise a recipe to follow as we can muster! 💜

[Pierre-Sassoulas]

😄 So the way I'm doing it is as follow:

git fetch -ap
git switch maintenance/3.0.x
git pull
git branch merge-maintenance-into-main
git merge origin/main
# fix obvious conflicts (at least the 3 places where there's conflicting versions)
git merge --continue
# while not(the only changes are the changelog, possibly changes in Contributors.txt)
    # Check the while condition with
    git diff origin/main
    # Fix things then fixup the merge commit
    git commit -a --amend
git push pierre
# Open a merge request from pierre/merge-maintenance-into-main to origin/main
# Select "Create a merge commit" enable auto-merge (so no one squash it after approving review by mistake)
# Wait for review

[Pierre-Sassoulas]

Having to remove manually the fragments so they don't end up on main would be more work. (Which is why I was not very argumentative with Daniel even if I think that we should not duplicate the changelog between patch and minor). Should probably be done with tbump or a script, or we won't release as often.

[Pierre-Sassoulas]

LGTM; you did something similar, and we simply need to use merge not squash or rebase, right ?