Home › Coding Path › Day 029
Day 029: Branching, Merging & Resolving Conflicts — Applied Lab
Learn Branching, Merging & Resolving Conflicts through applied workshop, 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
Dotfiles repo: settings, extensions list, setup script, README
Complete the work in a safe test environment, capture evidence, document decisions and record what you would improve in a second pass.