Summary
Congratulations! In this module, you learned how to use Git branches to collaborate with other developers and how to resolve merge conflicts.
You learned:
- What branches are, and how and when to use them
- How to merge branches
- How to resolve merge conflicts
At this point, you know enough about Git to work well with other developers and meet your project goals!
If you'd like to dig deeper, here are some other resources that you'll find helpful:
- On the command line, run
git help tutorialorgit help tutorial-2. - See Everyday Git, which you can also access from the command line by running
git help everyday. - Review GitHub's Git and GitHub learning resources.
You also can learn more from the documentation section of Git's official website.
Image credits
All cat pictures came from commons.wikimedia.org. Here are the links and attributions:
- Close up of a black domestic cat.jpg - Wikimedia Commons (Dogbert420 CC-BY-SA-4.0)
- Bobcat2.jpg - Wikipedia (Calibas public domain)
