Version control with Git — branches, merges, pull requests

What you'll learn

1. 1

   Imagine you're writing a story with a friend. You both want to try different endings without messing up the main story. That's what branches do in Git! 🌿

2. 2

   What is a branch in Git? 🌿

3. 3

   Let's make a new branch and add a feature together! 🛠️

4. 4

   Now you try: create a new branch called 'fix-bug' on this pretend project. 🐛

5. 5

   When you finish your feature, you bring it back to the main story. That's called a merge! 🔀

6. 6

   What does merging do? 🔀

7. 7

   Let's merge your 'fix-bug' branch into main. 🐛➡️📦

8. 8

   Sometimes two people change the same line — that's a conflict. What's the best way to handle it? 🤔