diff --git a/README.md b/README.md index 6aa19cd..5d80d48 100644 --- a/README.md +++ b/README.md @@ -1,53 +1,15 @@ -# On Demand Merge Conflict Course Repository +## Your GitHub Learning Lab Repository for Managing Merge Conflicts -*An introduction to merge conflicts that creates a simple Jekyll + GitHub Pages based on jglovier's [resume template](https://github.com/jglovier/resume-template/).* +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. -![img](images/screenshot.png) +Oh! I haven't introduced myself... -## Docs +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. -### Running locally +![issue tab](https://lab.github.com/public/images/issue_tab.png) -To test locally, run the following in your terminal: +I'll meet you over there, can't wait to get started! -1. Clone repo locally -1. `bundle install` -2. `bundle exec jekyll serve` -3. Open your browser to `localhost:4000` +> There are already some Pull Requests open, you will work on those later in the course. -### 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](https://pages.github.com/) 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](https://help.github.com/articles/setting-up-a-custom-domain-with-github-pages/) on the GitHub Help site for that topic. - -### Themes - -Right now resume-template only has one theme. More are coming :soon: though. :heart: - -## Roadmap - -A feature roadmap is [available here](https://github.com/jglovier/resume-template/projects/1). If you features suggestions, please [open a new issue](https://github.com/jglovier/resume-template/issues/new). - -## Contributing - -- To contribute to the development of the On Demand course, visit the On Demand [repository](https://github.com/github/training-kit/). -- To contribute to the resume template, visit the Resume Template [repository](https://github.com/jglovier/resume-template/). - -## License - -The code and styles are licensed under the MIT license. [See project license.](LICENSE) Obviously you should not use the content of this demo repo in your own resume. :wink: \ No newline at end of file diff --git a/_config.yml b/_config.yml index aaf0500..3a8d8f9 100644 --- a/_config.yml +++ b/_config.yml @@ -10,13 +10,13 @@ sass: # Resume settings resume_avatar: "true" -resume_name: "Skatetocat" -resume_title: "Professional Skater" -resume_contact_email: "skatetocat@github.com" +resume_name: "GitHub Teacher" +resume_title: "Professional Trainer" +resume_contact_email: "services@github.com" resume_contact_telephone: "1-(877)-448-4820" resume_contact_address: "San Francisco, California" -resume_header_contact_info: "San Francisco, California | 1-(877)-448-4820 | skatetocat@github.com" -resume_header_intro: "

Professional Skater, 'nuff said.

" +resume_header_contact_info: "San Francisco, California | 1-(877)-448-4820 | services@github.com" +resume_header_intro: "

Charting the knowledge of the Internet, just like Galileo charted the stars.

" # use "yes" to display the email contact button, # "no" to display an "I'm not looking for work" message, diff --git a/_data/experience.yml b/_data/experience.yml index e9f412a..19569fe 100644 --- a/_data/experience.yml +++ b/_data/experience.yml @@ -1,9 +1,9 @@ # Jobs -# Shoptocat -- company: GitHub, Inc. - position: Shoptocat - duration: March, 2013 — Present - summary: Create awesome swag, ensure orders get delivered quickly, collect all the stickers. +# Surftocat +- company: Self Employed + position: Surftocat + duration: Life + summary: I only live to get radical. # Job Title - company: Conway Meats @@ -11,9 +11,8 @@ duration: May, 2014 — May, 2015 summary: Web developer for a restuarant meat provider. - -# Supportocat -- company: GitHub, Inc. - position: Supportocat, GitHub for Business - duration: October 2016 — Present - summary: Provide amazing support to customers on the GitHub for Business platform +# Intern +- company: GitHub + position: Intern - Web Developer - Designer + duration: June, 2017 — August, 2017 + summary: Redesigned the services.github.com website without a calendar diff --git a/_data/interests.yml b/_data/interests.yml index 0cb5397..b265057 100644 --- a/_data/interests.yml +++ b/_data/interests.yml @@ -1,4 +1,12 @@ # Interests +<<<<<<< HEAD - description: Travel - description: Animated cartoons involving restuarants and burgers - description: Amusement parks + +======= +- description: Open Source +- description: Empowering underrepresented groups in tech through education and free events. +- description: French Horn + +>>>>>>> add-that-french-horn-branch diff --git a/_data/skills.yml b/_data/skills.yml index e190bdb..6306cd9 100644 --- a/_data/skills.yml +++ b/_data/skills.yml @@ -1,9 +1,7 @@ # Skills -# Education -- skill: Education - description: Developed and maintained various conference talks, online training, and in-person trainings covering various topics including Git, GitHub, and Open Source. - -# Leadership -- skill: Leadership - description: Managed multiple asynchronous teams in the development, maintenance, and release of various web applications and websites. \ No newline at end of file +# Programming + - LabVIEW + - Python + - Java + diff --git a/artifacts/add-a-branch.png b/artifacts/add-a-branch.png new file mode 100644 index 0000000..5778d09 Binary files /dev/null and b/artifacts/add-a-branch.png differ diff --git a/artifacts/basic-history.png b/artifacts/basic-history.png new file mode 100644 index 0000000..31b34ed Binary files /dev/null and b/artifacts/basic-history.png differ diff --git a/artifacts/branch-commits.png b/artifacts/branch-commits.png new file mode 100644 index 0000000..ac585b7 Binary files /dev/null and b/artifacts/branch-commits.png differ diff --git a/artifacts/deviated-branches.png b/artifacts/deviated-branches.png new file mode 100644 index 0000000..9c5d2fb Binary files /dev/null and b/artifacts/deviated-branches.png differ diff --git a/artifacts/final-merge.png b/artifacts/final-merge.png new file mode 100644 index 0000000..8b3fb32 Binary files /dev/null and b/artifacts/final-merge.png differ diff --git a/artifacts/merge-after-conflict.png b/artifacts/merge-after-conflict.png new file mode 100644 index 0000000..47558ce Binary files /dev/null and b/artifacts/merge-after-conflict.png differ diff --git a/artifacts/merge-simple-master.png b/artifacts/merge-simple-master.png new file mode 100644 index 0000000..2579cfe Binary files /dev/null and b/artifacts/merge-simple-master.png differ diff --git a/artifacts/no-ff-merge.png b/artifacts/no-ff-merge.png new file mode 100644 index 0000000..130afea Binary files /dev/null and b/artifacts/no-ff-merge.png differ diff --git a/artifacts/reverse-merge-after-conflict.png b/artifacts/reverse-merge-after-conflict.png new file mode 100644 index 0000000..d3eb7cd Binary files /dev/null and b/artifacts/reverse-merge-after-conflict.png differ