v0.1.24
Summary
- Adds a modal-only conflict resolver to the propagate workflow for
pyproject.tomlanduv.lockconflicts. - Preserves the Modal branch dependency overlay, regenerates
uv.lock, and pushes the merge when only those known files conflict. - Keeps the fallback PR path for all other conflicts.
Test plan
- Simulated the current
origin/mainintoorigin/modalmerge locally. - Verified the resolver clears
pyproject.tomlanduv.lockconflicts. - Verified the resolved
pyproject.tomlkeepsmodal>=0.73.162anduv.lockstill contains themodalpackage.
Made with Cursor