Closed ml8 closed 2 years ago
If the first attempt to resolve conflicts cleanly fails, fall back to the previous behavior (renaming any conflicts).
This is live, PR just for an FYI. Tested with student whose startup script was failing.
cc @betswms @CatieWelsh @msuperdock
If the first attempt to resolve conflicts cleanly fails, fall back to the previous behavior (renaming any conflicts).