Start free

Browse › GitHub

Create Branches and Merge Changes Safely

Guided

Part of GitHub Topic: Programming

Access

StationX Infrastructure Labs — 3 attempts per lab

🔒 Add StationX Infrastructure Labs — $149 / year · 3 attempts per lab

Already have access? Sign in.

New to this? Try a free practice lab — a scripted hacking challenge in your browser, no account needed.

What you'll do

In this lab, you will build features on separate branches and combine them into main while handling conflicts.

  1. Create and switch to new branches
  2. Make changes in a feature branch
  3. Merge branches back to main
  4. Resolve simple merge conflicts
  5. Use git log --graph to visualize history
  6. Create and merge branches
  7. Handle a merge conflict manually

Note: Once you begin the lab, you will not be able to pause, save, or return to your lab. Please ensure that you have set aside enough time to complete the lab before you start.

  • ⏱ About 30 minutes
  • Counts towards: GitHub Foundations