Sync conflict: new-resolver-config cannot merge main

The automated sync workflow failed to merge main into new-resolver-config due to merge conflicts.

Conflicting files:

tests/test_packagesettings.py

Manual resolution required. To fix:

git checkout new-resolver-config
git fetch origin
git merge origin/main
# resolve conflicts
git commit
git push

Workflow run: https://github.com/python-wheel-build/fromager/actions/runs/36601909622

Closing: the conflict was resolved, and new-resolver-config merged to main in #1414.

If you feel this change is still needed, feel free to reopen this issue. Thank you!

Navigation Menu