[Evergreen-general] Rebase alert - Lint patch merge

Andrea Buntz Neiman abneiman at equinoxoli.org
Mon Dec 4 14:55:45 EST 2023


Hello all,

Letting you know that the 3.12 release team decided to merge the lint bug
https://bugs.launchpad.net/evergreen/+bug/1850473 in advance of 3.12-rc,
and we did so at this afternoon’s meeting. Because of the way this bug
interacts with existing branches, if you have a current pullrequested
branch, it will need to be rebased against main as of this afternoon.

We apologize for any inconvenience, go forth and rebase all the things.

If your branch is older, you may also want to look at the following patches
as a source of other potential merge conflicts:

   - Changes involving form labels for the org unit select component:
   https://bugs.launchpad.net/evergreen/+bug/1999158
   - Angular 15/Bootstrap 5 bug:
   https://bugs.launchpad.net/evergreen/+bug/2000482
   - For Bootstrap class changes, you can refer to the Bootstrap migration
   spreadsheet:
   https://docs.google.com/spreadsheets/d/1NFx09zghDW_sGcbPnM8iED0_7S2XyISwCnWNuOMhLK4/edit?usp=sharing

On behalf of the 3.12 Release Team,

Garry Collum
Ruth Davis
Stephanie Leary
Andrea Buntz Neiman
Michele Morgan
Terran McCanna
Jane Sandberg



-- 
Andrea Buntz Neiman, MLS
Project Manager for Software Development | Product Specialist
Equinox Open Library Initiative
abneiman at equinoxOLI.org <abneiman at equinoxoli.org>
1-877-OPEN-ILS (673-6457) x5583
*https://www.equinoxOLI.org/ <https://www.equinoxOLI.org/>*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://list.evergreen-ils.org/pipermail/evergreen-general/attachments/20231204/73a8b44a/attachment.htm>


More information about the Evergreen-general mailing list