lee-two-github / 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.

merge-conflicts's Issues

Next steps

Nice work

Congratulations @lee-two-github, you've completed this course!

What went well

Before I say good-bye, here's a recap of all the tasks you've accomplished in your repository:

• You learned why merge conflicts happen
• You resolved a simple merge conflict
• You resolved a multi-file merge conflict
• You created a merge conflict, and resolved it!

What's next?

Here are some instructions you can use to keep working on your resumé:

Finishing the resume

---

Finishing the resume

To update the other sections of the resume, create a new branch and edit the files found in the _data folder.

For example, to modify the "Projects" section, edit the _data/projects.yml file. After making your changes, create a new pull request and merge your changes.

---

Changing the picture

---

Changing the picture

If you would like to change the image used on your resume, you need to make a few changes to the files.

1. Create a new branch, maybe name it something like new-avatar.
2. Navigate to the images directory and click the Upload files button.
3. Drag and drop your image.
4. Commit your change by clicking Commit changes.
5. On the new-avatar branch, open the _layouts/resume.html file and edit line 16. Replace images/bob-avatar.jpg with images/YOURFILENAME.
6. Create a pull request.
7. Merge the pull request, and delete the branch.

---

Enabling GitHub Pages

---

Enabling GitHub Pages

When you are happy with your resume, you will need to publish it with GitHub Pages. This resume is ready for GitHub Pages, you just need to turn it on. Follow these steps to enable GitHub Pages when you are ready to publish your resume:

1. Click on the Settings tab.
2. Scroll to the "GitHub Pages" section.
3. In the "Source" drop-down, select main branch.
4. Click Save.
5. 🚧 Warning! 🚧 Make sure you don't see any errors after you select save. If you do, your page won't build correctly and this step will be incomplete.

Your GitHub Pages resumé site will be live very shortly at the proper URL.

---

Keep Learning

Want to work on resolving merge conflicts using the command line? Check out this documentation.

Want to keep learning? Feel free to check out our other courses?

---

I won't respond to this issue, go ahead and close it when finished!