Git, Infrastructure as Code & Deployment Pipelines (CI/CD) with Vibe Coding

Welcome and Programme Overview

Introduction to the session, objectives, and housekeeping.

Git Foundations and Repository Setup

The mental model first: what a commit actually is, why the staging area exists, and what distinguishes a local repository from a remote one. Setting up a repository from nothing and connecting it to a remote. Reading history well enough to answer the question that matters in an incident, which is what changed and when. Hands-on: initialise a repository, build a series of commits and inspect the project history.

Break

Branching Strategies and Team Collaboration

Feature branches, release branches and hotfix patterns, and the honest trade-offs between them rather than a recommendation to adopt whichever one is fashionable. Push, pull and fetch, including the difference between fetch and pull that causes most of the confusion. Working alongside other people without overwriting their work. Hands-on: a multi-branch workflow with simulated team activity.

Lunch

Merge Conflicts and How to Resolve Them

Why conflicts happen, which is almost never the reason people assume. Reading conflict markers without guessing. Three-way merges and a repeatable resolution strategy that does not quietly discard someone else's changes. Hands-on: create conflicts deliberately, then resolve them and verify nothing was lost.

Break

Rebase, Cherry-Pick and a History Worth Reading

Rebasing against merging, and when each is the right call. Interactive rebase for tidying work before it is reviewed. Cherry-pick for the cases that genuinely need it. Keeping a history that a colleague can actually use six months later. Hands-on: rebase a working branch, resolve the conflicts it raises and prepare the changes for a pull request.

Day 1 Close

Recap and what to review before day two.

Day 1 Review

Recap of day one and the questions it left open.

Infrastructure as Code Fundamentals

Why describing infrastructure in a file beats configuring it by hand, stated in terms of the failures it prevents. Declarative against imperative approaches. Idempotence, and why it is the property that makes automation trustworthy. Putting infrastructure under the same version control as application code. Hands-on: write a basic infrastructure configuration and manage it through Git.

Break

Vibe Coding for Infrastructure and Development

AI-assisted coding workflows in practice: prompt-driven development, and the review discipline that separates useful output from plausible-looking output. Using an assistant to create, explain, refactor and troubleshoot code while keeping the result structured, reviewable and maintainable by someone who was not in the room. Where these tools are genuinely fast, and where accepting their output uncritically creates work rather than saving it.

Lunch

Building Your First CI/CD Pipeline

Pipeline stages, triggers and what should happen automatically against what should still need a human. Connecting source control to build and deployment. Managing environments so that a deploy to staging cannot become a deploy to production by accident. Hands-on: configure a pipeline that runs from a source commit through build to deployment.

Break

End-to-End Project: Git, Infrastructure and Deployment

Teams run the full workflow: branch, change infrastructure configuration, open a pull request, merge, and watch the pipeline build and deploy. Then they break it. Troubleshooting the pipeline and configuration failures that occur most often in real projects, and finishing with a CI/CD workflow that works.

Wrap-Up and Q&A

Key takeaways, next steps, and close.