Banner for Level Up Your Git: Branching and Collaboration

Level Up Your Git: Branching & Collaboration

by Association for Computing Machinery

Workshop Career Development Computer Science Networking Software Development Technology Web Development

Wed, Nov 12, 2025

5:30 PM – 6:30 PM CST (GMT-6)

Add to Calendar

Private Location (sign in to display)

View Map
4
Registered

Registration

Details

Thanks to everyone who attended our first Git workshop! You've successfully learned how to track your projects with git add, commit, and push.

Now, it's time to tackle the real-world scenarios:

  • "How do I work on a new feature without breaking my main program?"

  • "How do I work with a partner on the same project?"

  • "Help! I made a mistake—how do I go back?"

Join ACM for Part 2 of our Git series, where we move from a solo tool to a professional collaboration powerhouse. This hands-on workshop is all about branching.
 

What You'll Learn:

  • The "Why" of Branching: Understand why git branch is the most essential command for safe development.

  • The Workflow: Master the branch checkout commit merge cycle.

  • Team Collaboration: We'll talk about team environments and show you how to use GitHub to pull changes and keep your project in sync.

  • Fixing Mistakes: Learn the "Oh no!" commands to undo changes safely (git restore, git revert).

  • Live-Action Conflicts: We'll go over merge conflicts together and show you, step-by-step, how to resolve it.

 

Workshop Details:

  • Date: Wednesday, November 12th

  • Time: 5:30 PM

  • Location: Durland 1117

  • Prerequisites: This workshop is for beginners, but it assumes you know the material from Part 1. You should be comfortable with git init, add, commit, and push.

  • Missed Part 1? You're still welcome! Please review the basics of git here beforehand to get up to speed.

  • What to Bring: Your laptop with Git installed!

Hosted By

Association for Computing Machinery | Website | View More Events

Contact the organizers