After #2790, #2942, and #2941, main has diverged significantly from develop. This ticket is to restore main to a snapshot of develop's history (what it is designed to be... roughly).
Backport this stuff to develop (incl. the Angular bug fixes), resolving merge conflicts, and QA should check for any front-end bugs in Dev as a result.
Purpose
Sync dev with test
Acceptance Criteria
** Additional context**
Probably a good idea to create a new branch off of develop and merge main into it. This way, we can resolve conflicts and test without threatening develop.
Confirm this task meets our team Definition of Ready (DoR) before moving to the Next Sprint column.
Confirm this task meets our team Definition of Done (DoD) before moving to the Done column.
After #2790, #2942, and #2941, main has diverged significantly from develop. This ticket is to restore main to a snapshot of develop's history (what it is designed to be... roughly).
Backport this stuff to develop (incl. the Angular bug fixes), resolving merge conflicts, and QA should check for any front-end bugs in Dev as a result.
Purpose
Sync dev with test
Acceptance Criteria
** Additional context**
Probably a good idea to create a new branch off of develop and merge main into it. This way, we can resolve conflicts and test without threatening develop.
Confirm this task meets our team Definition of Ready (DoR) before moving to the Next Sprint column.
Confirm this task meets our team Definition of Done (DoD) before moving to the Done column.