Comment by xk3

> 2. Avoid `reset --hard` at all costs

Sounds like you might be looking for `git reset --keep`