Git Tutorial Part 2: Branching, Merging, and the Mistakes

Git gets dangerous once you move past git clone and git commit. In Part 2 of our Git tutorial, Shawn and Alex dive into branching, merging, and real-world Git workflows—the stuff that actually breaks teams when done wrong. This episode covers: How Git branching really works When to merge vs rebase (and why most teams screw this up) Common Git mistakes that cause broken builds and lost work Practical Git workflows used by real DevOps teams If you’ve ever: Been afraid to touch a branch Broken main (or master) Had a merge conflict spiral out of control …this video is for you. This is Part 2 of our Git tutorial series—built for developers, DevOps engineers, and anyone tired of Git being treated like magic instead of a tool. 👉 Watch Part 1 if you’re still shaky on the basics https://youtu.be/Fh1b7PabT2Q 👉 Subscribe to DevOps Roundup for real-world DevOps, Git, CI/CD, and career advice—no fluff, no vendor nonsense. For DevOps consulting and support, visit https://bit.ly/45DwND1 For Jira tutorials, visit https://www.youtube.com/c/ApetechTechTutorials Meet us at CES in 2026 https://www.ces.tech/ Shawn will be attending CES. Comment if you'd like Alex to join him. Buy us Coffee https://buymeacoffee.com/sdoyle #git #devops #training