Git as Engineering Discipline
Back
Beginner Plus

Git as Engineering Discipline

A practical Git course for developers who want more than memorized commands: understand the model, keep a clean history, work safely with branches, resolve conflicts, and ship changes without chaos.

Git Version Control Branching Team Workflow Release Management

Course outline

Published version: modules, lessons, and duration.

01

Working Environment, Make, and the Course Contract

  1. 1 Working Environment: Terminal, Git, SSH, and Review URL
    65 min
  2. 2 Make as an Engineering Habit
    35 min
  3. 3 Smoke checks and error report
    35 min
02

Git Foundations and the Local History Model

  1. 1 Why Version Control Exists
    35 min
  2. 2 First local commit in an already configured repository
    35 min
  3. 3 Local Git Layers: working tree, staging area, repository, and HEAD
    35 min
  4. 4 PhpStorm as a Working Interface over Git
    38 min
03

Clean Commits and Readable History

  1. 1 Atomic commit
    35 min
  2. 2 Status, diff, and staged diff
    35 min
  3. 3 Fix staging and separate changes
    35 min
  4. 4 Good commit message
    35 min
  5. 5 History as an Interface Review
    35 min
04

Branches, Merge, Rebase, and Worktree

  1. 1 Branch as Task Isolation
    35 min
  2. 2 Feature branches and naming
    35 min
  3. 3 Merge and fast-forward
    35 min
  4. 4 Rebase of a personal branch
    35 min
  5. 5 Worktree for parallel work
    35 min
05

Remotes, SSH, Pull Request, and Review

  1. 1 Remote repository and `origin`
    35 min
  2. 2 `fetch`, `pull`, `push` and tracking
    35 min
  3. 3 SSH remote and HTTPS URL for review
    35 min
  4. 4 Pull request and review
    35 min
  5. 5 Conflicts and Explanation of Resolution
    35 min
  6. 6 Protected branches and required checks
    35 min
06

Corporate Integration Flow and Environments

  1. 1 `main` is protected: this is not a desktop
    35 min
  2. 2 `develop` as an integration line
    35 min
  3. 3 Staging, release, and production path
    35 min
  4. 4 When such a flow is too heavy
    35 min
07

Recovery, Safe Undo, Hotfix, and Backport

  1. 1 Restore, reset and revert
    35 min
  2. 2 Published history and safe undo
    35 min
  3. 3 Reflog and stash
    35 min
  4. 4 Cherry-pick
    35 min
  5. 5 Hotfix
    35 min
  6. 6 Backport and support line
    35 min
08

Conventional Commits, Tags, and Release Notes

  1. 1 Conventional Commits as a Contract
    35 min
  2. 2 Types, scopes, and breaking changes
    35 min
  3. 3 SemVer and release impact
    35 min
  4. 4 Tags as release markers
    35 min
  5. 5 Changelog and release notes
    35 min
  6. 6 Repository hygiene
    35 min
09

Branching Strategies and Release Workflows

  1. 1 Branching strategy as a team contract
    35 min
  2. 2 Trunk based development
    35 min
  3. 3 GitHub Flow
    35 min
  4. 4 GitLab Flow and environments
    35 min
  5. 5 Git Flow Without Religion
    35 min
  6. 6 Release branches, hotfixes, and support lines
    35 min
  7. 7 Choosing a Workflow for the Team
    35 min
  8. 8 Corporate Git Anti-patterns
    35 min