You’re here to learn about conflicts! So let’s get conflicted.
- Check out to the
_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.
- Return to your Pull Request. A conflict now appears because
my-titleis 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.
- Remove the conflict markers and choose your desired title.
- Click Mark as resolved.
- Your Pull Request is now free of conflicts. Press the big green button to merge your pull request!