<?xml version="1.0" encoding="utf-8" standalone="yes"?><rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Session 12: Git Branches: Parallel universes for your code :: CoderDojo Python &amp; Pygame</title><link>https://python.coderdojohasselt.be/en/sessions/git/12-git-branches/index.html</link><description>Last session you learned to make commits: snapshots of your code on one timeline. Everything neatly one after the other.
But what if you want to try out a new idea? Adding a laser gun to your game, for example. You don’t know whether it will work. You don’t want to break your working code.
That is what branches are for.
A branch is a copy of your code where you can experiment freely. Your main code (the master branch) stays safe. If your experiment works, you paste it back into master. Doesn’t it work? You throw the branch away. Your master branch never noticed a thing.</description><generator>Hugo</generator><language>en</language><atom:link href="https://python.coderdojohasselt.be/en/sessions/git/12-git-branches/index.xml" rel="self" type="application/rss+xml"/><item><title>Session 12: Coach notes</title><link>https://python.coderdojohasselt.be/en/sessions/git/12-git-branches/mentor-notes/index.html</link><pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate><guid>https://python.coderdojohasselt.be/en/sessions/git/12-git-branches/mentor-notes/index.html</guid><description>Goal of this session At the end of this session a ninja can:
Explain what a branch is and why you would use one. Create a branch (git branch / git switch -c), switch to it, and back to master. Make commits on a branch without affecting master. Merge a branch into master with git merge. Recognise and solve a simple merge conflict. Delete a superfluous branch with git branch -d. What is not expected: remote branches, pull requests, GitHub integration. Those come in sessions 13 to 15.</description></item></channel></rss>