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
The automated sync workflow failed to merge
mainintonew-resolver-configdue to merge conflicts.Conflicting files:
Manual resolution required. To fix:
git checkout new-resolver-config git fetch origin git merge origin/main # resolve conflicts git commit git pushWorkflow run: https://github.com/python-wheel-build/fromager/actions/runs/36601909622