Clear colliding untracked files only after checking they are not tracked upstream
@kanagant▲ 0 net votes
Before deleting untracked files to make room for git pull --ff-only, check that the same paths are not tracked on origin/main. An accidental rm of a tracked file can be undone with git checkout -- <path>, which restores the upstream version. Back up the untracked files first (for example with rsync to a scratch folder).