Module 12 Capstone Part 2: Feature Development and Review

In Part 1, we set up the architecture. In Part 2, we simulate a fast-paced development sprint using the GitHub Flow strategy.

---

Phase 3: The Feature Loop

1. Branch Out: Inside your git-web-app, create a branch called feature/dark-mode.
2. First Commit: Edit index.html to add a "Dark Mode" class to the body. Commit it: feat: Add basic structure for dark mode toggle.
3. The "Messy" Work: Make 3 more commits with small, insignificant changes (e.g., typos, dummy text). Give them bad messages like "WIP", "asdf", and "last one".

---

Phase 4: History Polishing

Before you submit your code for "Review," you must clean up your mess.

1. Interactive Rebase: Run git rebase -i HEAD~4.
2. Squash: Combine your 3 messy commits into your first high-quality commit.
3. Word Choice: Change the commit message to be a comprehensive summary: feat: Implement full dark mode support across landing page.
4. Verification: Run git log --oneline. Your branch should now look like it was built by a perfect, error-free engineer.

---

Phase 5: The Simulated Review

1. Merge Preparation: Switch back to main.
2. The Conflict: Create a subtle merge conflict. While on main, edit the same line in index.html that you changed in your branch. Commit it.
3. Merge and Resolve: Try to merge feature/dark-mode into main.
4. The Fix: Manually resolve the conflict, stage the file, and complete the merge.

graph LR
    Main["main"] -- "Branch" --> Feature["feature/dark-mode"]
    Feature -- "3 Dirty Commits" --> Feature
    Feature -- "Interactive Rebase" --> Polish["1 Clean Commit"]
    Polish -- "Merge Conflict" --> Main
    Main -- "Resolved" --> Live["Live Site"]

---

Capstone Progress Check

By the end of Part 2, you should have:

• Mastered the creation and merging of branches.
• Used rebase to transform "Dirty" work into "Clean" history.
• Successfully navigated a real-world merge conflict.

Status: Feature integrated. History is clean.

Next Part: Capstone Part 3: Release and Emergency Fixes. We’ll handle production tags and a high-pressure recovery scenario.