What is DevOps? Culture, CAMS & Git Version Control

Lab 12 of 20 · DevOps & Git · 5 hands-on activities · bilingual (English + සිංහල)

පිටුව 12: DevOps කියන්නේ ඇයි සහ මොකක්ද? CAMS සහ Git Version Control

Wall of Confusion බිඳ හෙලූ DevOps විප්ලවය, CAMS මූලධර්ම, Git 3-Stage Model, Branching (feature/fruits) සහ Merge Conflicts විසඳන හැටි.

Architectural Foundation & Systems Diagram

For decades, IT organizations suffered from a structural civil war known as the Wall of Confusion. Developers were rewarded for changing things quickly, while Operations were rewarded for keeping systems stable.

• 🤝 The CAMS Framework — • Culture: Blameless collaboration.
  • Automation: CI/CD replaces manual toil.
  • Measurement: Telemetry drives decisions.
  • Sharing: Lessons shared across silos.

• 🌿 Git 3-Stage Architecture — • Working Directory: Local workspace where files are edited.
  • Staging Area: Prepares snapshots via git add.
  • Local Repository: Cryptographic commit history via git commit.

• 💥 Merge Conflicts — Occurs when two developers edit the same lines of code. Git marks the conflict with <<<<<<< HEAD, =======, and >>>>>>>. Resolve by hand, then add and commit.

Step-by-step practical lab

Step 01: Check Git Working Tree & Staging Status

සිංහලෙන් — Code එකේ සිදු වූ වෙනස්කම් Git Status මඟින් බලාගනිමු.

Display modified files, staged files, untracked files, and active branch state in the Git repository.

git status

• status : Staging index එක සහ local repository එකේ තත්ත්වය පෙන්වයි.

Expected output

On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
	modified:   configs/nginx.conf

Untracked files:
	scripts/deploy_canary.sh

Step 02: List Local and Remote Git Branches

සිංහලෙන් — Git Repository එකේ තියෙන සියලුම Branches පරීක්ෂා කරමු.

Query all local branch references and identify the currently checked-out branch.

git branch

• branch : පවතින සියලුම branches පෙන්වයි. * ලකුණෙන් සක්‍රීය branch එක දක්වයි.

Expected output

* main
  feature/fruits
  hotfix/memleak

Step 03: Create & Switch to New Feature Branch

සිංහලෙන් — අලුත් Feature Branch එකක් (feature/fruits) සාදා මාරු වෙමු.

Execute git checkout with the -b flag to create and switch to a dedicated feature branch.

git checkout -b feature/fruits

• -b : Create & Checkout: අලුත් branch එකක් සාදා එකවර එයට මාරු වේ.

Expected output

Switched to a new branch 'feature/fruits'

Hands-on practice activities

Work through these yourself — tick them off as you go.

• Activity 56: Check Git Working Tree Status (Drill) — Inspect staged, unstaged, and untracked files in the active git repository.
• Activity 57: List Local Git Branches (Drill) — Query all local branch references and identify the currently checked-out branch.
• Activity 58: Course Branching (feature/fruits) (Checkpoint) — Remember the instructor's command: 'git checkout -b feature/fruits' creates and immediately switches to the new feature branch.
• Activity 59: Blameless Postmortem Principle (Checkpoint) — In a DevOps culture, when production breaks, you do NOT fire the engineer who typed the command. You fix the system so that one mistake cannot break production.
• Activity 60: Git Staging Command Quiz (Quiz) — Which command moves changes from the Working Directory into the Staging Index? Answer: git add.

Keep going: ← Lab 11 · Lab 13 → · Track your progress in the Self Guide