Idiot Proof Git
Rebase should never be used. Or, if it is used, it should be treated as a dangerous thing to do that’s well outside the norm.<p>Most of the arguments in favor of rebase are by people fanatical about having a git history organized just so. It’s not worth the headache and effort. PRs are a better unit of work than commits in practice.<p>Configure GitHub or whatever you use to squash merge only and you’ll be good.<p>Since moving to this workflow I’ve had zero issues losing data due to a confusing git situation.