Git

Fix merge conflicts, rebases, lost commits, branch issues, history rewriting, and real-world Git workflows