Day 6 of 60

Git Workflow & Collaboration

📊 Easy ⏱️ 1-2 hours ⚡ 150 XP ✓ Completed

Master the Git workflow used in real teams. Learn branching strategies, how to handle merge conflicts, and how to write meaningful commit messages that tell a story.

📋 Objectives

✓
Create feature branches and merge them to main
✓
Simulate and resolve a merge conflict
✓
Write conventional commit messages (feat:, fix:, docs:)
✓
Set up a .gitignore for your project