ross-bohr/merge-conflicts

Your GitHub Learning Lab Repository for Managing Merge Conflicts

Welcome to your repository for your GitHub Learning Lab course. This repository will be used during the different activities that I will be guiding you through.

Oh! I haven't introduced myself...

I'm the GitHub Learning Lab bot and I'm here to help guide you in your journey to learn and master the various topics covered in this course. I will be using Issue and Pull Request comments to communicate with you. In fact, I already added an issue for you to check out.

I'll meet you over there, can't wait to get started!

There are already some Pull Requests open, you will work on those later in the course.

This course is using the ✨ open source project resume-template. In some cases we’ve made changes to the history so it would behave during class, so head to the original project repo to learn more about the cool people behind this project.