Home › Coding Path › Day 017
Day 017: Branching, Merging & Resolving Conflicts — Deep Dive
Learn Branching, Merging & Resolving Conflicts through concepts & mental models, guided resources, practical work and a portfolio-ready outcome.
Learning objectives
Understand the topic
Explain Branching, Merging & Resolving Conflicts clearly, connect it to the VS Code + Git Setup phase, and identify one limitation or risk.
Apply the skill
Use Windows Terminal and Git to produce a small, reviewable result that demonstrates the concept.
Study plan and official resources
Portfolio practice
Personal knowledge base in Markdown with linked notes
Complete the work in a safe test environment, capture evidence, document decisions and record what you would improve in a second pass.