Greenwood Library Website — Git Collaboration Lab

DevOps Context

This project was used to practice real-world Git collaboration patterns: feature branches, PR review workflows, merge strategy selection (squash vs rebase), and merge conflict resolution — foundational skills for any team-based DevOps role.

Context: Part of devops-labs Module-1 Capstone 1 — full workflow documentation lives there.

---

What Was Practised

Skill	Implementation
Feature branching	morgan/add-book-reviews and jamie/update-events branches
PR workflow	Create PR → request review → address feedback → merge
Merge strategies	Morgan's changes: Squash merge · Jamie's changes: Rebase merge
Conflict resolution	Identify conflicting files → discuss → use merge editor → commit resolution
Daily sync	git pull origin main before new work; git fetch && git rebase origin/main

Branch Structure

main
├── morgan/add-book-reviews  →  added book_reviews.html  →  Squash merged
└── jamie/update-events      →  updated events.html      →  Rebase merged

Contributor Workflow Summary

Action	Morgan	Jamie
Create Branch	git checkout -b add-book-reviews	git checkout -b update-events
Daily Sync	git pull origin main	git fetch && git rebase origin/main
Commit Message	feat: add book reviews section	feat: update community events
PR Merge Strategy	Squash	Rebase

Files

greenwood-library-website/
├── home.html
├── about_us.html
├── events.html
├── contact_us.html
├── book_reviews.html   # Added by Morgan via feature branch
└── README.md