Skip to content

Clarify an upcoming merge from release-2023.

M. Eric Irrgang requested to merge 4767-address-merge-conflicts-main into main

Conflicts in a future merge from release-2023 into main will be easier to resolve if we preemptively normalize the intended content.

Closes #4767 (closed)

Merge request reports