Kurt McKee e0c78d9c56 Resolve merge conflicts ... Note that this does NOT port the following command over: ```shell git config --global protocol.file.allow always ``` Doing so would change the git configuration of users running the unit tests locally, and this is not an acceptable outcome. Instead, the git configuration is modified at the CLI using the `-c protocol.file.allow=always` argument to accomplish the same thing without side effects.		2022-12-16 13:52:33 -06:00
..
workflows	Resolve merge conflicts	2022-12-16 13:52:33 -06:00