Merge maintenance/3.0.x into main following 3.0.1 release #2323
Conversation
This reverts commit 0ea6d86.
Fix 3.0.x maintenance branch
(cherry picked from commit d7be465) Co-authored-by: Jacob Walls <[email protected]>
|
@Pierre-Sassoulas would you be (whenever you have the chance) able to help me out understanding how we do these forwardports? I find myself manually reverting the changes to the version number, which apparently adds a commit to the maintenance branch I wouldn't have expected. |
|
This github diff isn't very helpful 🤣 |
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #2323 +/- ##
=======================================
Coverage 92.85% 92.86%
=======================================
Files 94 94
Lines 11056 11065 +9
=======================================
+ Hits 10266 10275 +9
Misses 790 790
Flags with carried forward coverage won't be shown. Click here to find out more.
|
|
I'm also reverting the version change manually but I amend the merge commit instead of creating a new commit (heavy process that prevent us to release say after each merge request) |
|
The github diff should be only the changelog, it seems something went wrong (?) |
|
I'm stumped; the code exists in both branches. |
|
I think it's github doing some magic so you can see what's on the merged branch (?). Merge commit seems fine: dd16f34 |
|
Thanks for looking with me! |
|
@Pierre-Sassoulas should we restore |
|
Restore ? |
|
It was deleted. Won't we keep it for a year or so? |
|
Ha sure, I didn't realize I deleted it. Probably something is wrong with the branch protection regex if I was able to do that. |
|
(We should to keep it until 3.1.0 is out) |
No description provided.