Giters

Kizbee / merge-conflict

Home Page:https://lab.github.com/githubtraining/managing-merge-conflicts

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

Next steps

github-learning-lab opened this issue · comments

commented

Nice work

celebrate

Congratulations @Kizbee, 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 practiced a normal merge
  • You resolved a simple merge conflict
  • You created a merge conflict, and resolved it!
  • You resolved a multi-file merge conflict

What's next?

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

Finishing the resume

Finishing the resume

To modify the other sections of the resume, simply create a new branch and modify 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 officially publish your resume:

  1. Click on the Settings tab.
  2. Scroll to the "GitHub Pages" section.
  3. In the "Source" drop-down, select master 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. Click here to check it out.

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!