Paul's Python CoursePPC

Branches and merging

Not met yet

A branch is a name pointing at a commit. git switch -c name makes one and moves you onto it; commits there move that name and leave main alone. git merge name brings a branch's work into the one you're on. If nothing happened on your branch meanwhile, it's a fast-forward.

Try it

main.py

Output

Press Run and what your program prints shows up here.

Easy to get wrong

  • Thinks a branch is a copy of the whole folder.
  • Thinks git merge X sends the current branch's work into X.

Where it comes up