Closed github-learning-lab[bot] closed 5 years ago
Hi! I'm the friendly :robot: of this repo.
We're happy you're here :wave:. Everyone is welcome here, so I'm making you a collaborator. This will give you access to commit on this repo.
@msorre2, nice work creating a pull request! Let's talk over there.
Welcome to Managing Merge Conflicts :tada:
Hello, and welcome! If you're here to learn about and practice resolving merge conflicts, you're in the right place.
In this course, you'll learn why merge conflits happen by solving four merge conflicts. All of the merge conflicts in this course will be simple enough to solve from within the GitHub.com user interface, but if you'd prefer, you can solve them using the command line or other local tools.
As an added bonus, the project we are using for this course is a resume hosted on GitHub Pages! So, if you want to keep working after you complete this course, please feel free!
How merge conflicts happen
Version control lets you make incremental changes to your code or file base while keeping the history. Git operates as a linked list, so a small history of three commits :book: might look like this:
In the GitHub Flow, you...
A Merge conflict occurs when someone else made a change on the base branch in the same file and location where you proposed changes. This usually happens when someone else merges in their branch before you merge yours.
This can be intimidating, but have no fear, Git knows how to handle this! It only needs a human to decide how to resolve the conflict.
Step 1: Create a Pull Request
Before we get too far ahead of ourselves, let's first practice making a simple change on a branch. Visualize your actions using the flow you reviewed above.
:keyboard: Activity: Create a normal pull request
_data/skills.yml
filechange-skills
For a printable version of the steps in this course, check out the Quick Reference Guide.
Look for my next response in your pull request