Your First Conflict

You’re here to learn about conflicts! So let’s get conflicted.

  1. Check out to the master branch.
  2. In _config.yml, change lines 2-3 again to update your resume’s title, and description. Ensure your changes are different from those in step 2 from the previous page of instructions.
  3. Return to your Pull Request. A conflict now appears because my-title is based on a previous point in history, and new commits override our proposed change. Let’s solve this, our first conflict. Click on Resolve conflict.
  4. Remove the conflict markers and choose your desired title.
  5. Click Mark as resolved.
  6. Your Pull Request is now free of conflicts. Press the big green button to merge your pull request!
Continue