Skip to content

eostb/on-demand-merge-conflict

 
 

Repository files navigation

On Demand Merge Conflict Course Repository

An introduction to merge conflicts that creates a simple Jekyll + GitHub Pages based on jglovier's resume template.

img

Docs

Running locally

To test locally, run the following in your terminal:

  1. Clone repo locally
  2. bundle install
  3. bundle exec jekyll serve
  4. Open your browser to localhost:4000

Customizing

First you'll want to fork the repo to your own account. Then clone it locally and customize, or use the GitHub web editor to customize.

Options/configuration

Most of the basic customization will take place in the /_config.yml file. Here is a list of customizations available via /_config.yml:

Editing content

Most of the content configuration will take place in the /_layouts/resume.html file. Simply edit the markup there accordingly

Publishing to GitHub Pages for free

GitHub Pages will host this for free with your GitHub account. Just make sure you're using a gh-pages branch, and the site will automatically be available at yourusername.github.io/resume-template (you can rename the repo to resume for your own use if you want it to be available at yourusername.github.io/resume). You can also add a CNAME if you want it to be available at a custom domain...

Configuring with your own domain name

To setup your GH Pages site with a custom domain, follow the instructions on the GitHub Help site for that topic.

Themes

Right now resume-template only has one theme. More are coming 🔜 though. ❤️

Roadmap

A feature roadmap is available here. If you features suggestions, please open a new issue.

Contributing

  • To contribute to the development of the On Demand course, visit the On Demand repository.
  • To contribute to the resume template, visit the Resume Template repository.

License

The code and styles are licensed under the MIT license. See project license. Obviously you should not use the content of this demo repo in your own resume. 😉

About

A repo for merge conflicts

Resources

License

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Languages

  • HTML 54.4%
  • CSS 34.0%
  • Ruby 11.6%