What's included

• Full day of hands-on labs (8 hours)
• Up to 10 participants
• Git fundamentals: init, clone, add, commit, push, pull
• Branching and merging: create, switch, merge, delete branches
• Branching strategies: feature branches, Git Flow, trunk-based development
• Conflict resolution: understanding, preventing, and resolving merge conflicts
• Interactive rebase, cherry-pick, and stash
• Working with remotes: fetch, pull, push, upstream tracking
• Pull requests and code review workflows
• Git log, diff, blame, and bisect for troubleshooting
• Tagging releases and writing meaningful commit messages
• Course materials and cheat sheet included
• 30-day post-training support for questions

Workflow covered

Who is this for?

This workshop is built specifically for operations engineers, sysadmins, and infrastructure teams who are being asked to work with Git but have not had formal training. It is common for ops teams to be handed a Terraform or Ansible repository and told to "just use Git" without anyone explaining how it actually works. This session fills that gap. It is also valuable for teams transitioning from manual change management processes to GitOps workflows, where every infrastructure change goes through version control. Participants do not need any prior Git experience, but should be comfortable using the command line.

How it works

The workshop is delivered remotely over a full day and is split into two halves. The morning covers Git fundamentals - initialising repositories, making commits, understanding the staging area, and working with remotes. Every concept is taught through practical exercises, not slides. By lunchtime, your team will be comfortable with the core Git workflow.

The afternoon moves into intermediate territory - branching strategies, merge workflows, conflict resolution, interactive rebase, and pull request processes. The session uses realistic scenarios that mirror what your team will encounter day-to-day: merging infrastructure changes, resolving conflicts in Terraform files, and reviewing each other's code. Everyone leaves with a printed cheat sheet and 30 days of support for follow-up questions as they start applying what they have learned.

Workshop schedule

• 09:00 - 09:30: Setup and introductions
• 09:30 - 11:00: Git fundamentals (init, clone, add, commit, push, pull)
• 11:00 - 11:15: Break
• 11:15 - 12:30: Working with remotes and understanding the Git model
• 12:30 - 13:30: Lunch
• 13:30 - 15:00: Branching strategies, merging, and conflict resolution
• 15:00 - 15:15: Break
• 15:15 - 16:30: Intermediate workflows (rebase, cherry-pick, stash, pull requests)
• 16:30 - 17:00: Wrap-up, Q&A, and next steps