Re:How you can go wrong with Git
by saagarjha on Sunday November 04, 2018 @01:07AM
(#18374355)
In summary: don't mess with your remote. Rebase, amend, go nuts on your local branch, it's fine. But don't forcibly rewrite history for other people. If you mess something up, add a commit fixing it; don't just nuke it.
[ Parent
| on HN ]
Not quite. Just have at least one branch (like master) where everyone agrees to never ever rewrite history. Rewriting history on feature branches that are already pushed is very useful.
Unless you decide that your git history is not worth maintaining. In that case only merge and commit and never force push. But git history is worth the extra effort to learn to rebase properly imo.
and for god sake if you can avoid it, and you should, do not use git LFS.