…ailures
linkWithMake ran make install without pre-backing-up files that stow
(called by the Makefile) would conflict with. The default dotfiles repo's
Makefile calls stow directly, so pre-existing .gitconfig/.zshrc on the
runner caused make to exit 2, failing all three vm-e2e dotfiles tests.
Apply the same backupConflicts loop that linkWithStow already uses:
scan each package directory, back up regular-file conflicts, restore on
make failure, clean up on success. Also updates the archtest baseline
whose line numbers shifted with the added code.
What does this PR do?
Pre-backs-up existing regular files that would conflict with stow before running make install, mirroring the logic already in linkWithStow.
Why?
The v0.61.0 release workflow failed at the vm-e2e stage:
PR #123 added linkWithMake to prefer a Makefile's install target over calling stow directly, but didn't carry over the backupConflicts step that linkWithStow has always run. The default dotfiles repo's Makefile delegates to stow, which aborts on pre-existing files it can't replace. On the vm-e2e runner, .gitconfig and .zshrc exist from earlier installer steps.
Testing
Cross-repo checklist
Notes for reviewer
linkWithMake now:
This is the same pattern linkWithStow has used since the feature landed.