├── .bundle └── config ├── .gitignore ├── Gemfile ├── Gemfile.lock ├── LICENSE ├── README.md ├── _assets ├── icons.ai ├── icons │ ├── icon-dribbble.svg │ ├── icon-facebook.svg │ ├── icon-github.svg │ ├── icon-instagram.svg │ ├── icon-linkedin.svg │ ├── icon-pdf.svg │ ├── icon-print.svg │ ├── icon-twitter.svg │ └── icon-website.svg └── resume-web-template.sketch ├── _config.yml ├── _data ├── associations.yml ├── education.yml ├── experience.yml ├── interests.yml ├── links.yml ├── projects.yml ├── recognitions.yml └── skills.yml ├── _includes ├── head.html ├── icon-links.html ├── icons │ ├── icon-dribbble.html │ ├── icon-facebook.html │ ├── icon-github.html │ ├── icon-instagram.html │ ├── icon-linkedin.html │ ├── icon-pdf.html │ ├── icon-print.html │ ├── icon-twitter.html │ └── icon-website.html └── print-social-links.html ├── _layouts └── resume.html ├── _sass ├── _base.scss ├── _layout.scss ├── _mixins.scss ├── _normalize.scss ├── _resume.scss └── _variables.scss ├── artifacts ├── add-a-branch.png ├── basic-history.png ├── branch-commits.png ├── deviated-branches.png ├── final-merge.png ├── merge-after-conflict.png ├── merge-simple-master.png ├── no-ff-merge.png └── reverse-merge-after-conflict.png ├── css └── main.scss ├── favicon.png ├── images ├── avatar.jpg ├── femalecodertocat.png └── screenshot.png └── index.html /.bundle/config: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/.bundle/config -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- 1 | _site 2 | .sass-cache 3 | .DS_Store 4 | _vendor 5 | -------------------------------------------------------------------------------- /Gemfile: -------------------------------------------------------------------------------- 1 | source "https://rubygems.org" 2 | 3 | gem 'github-pages', '>= 200' -------------------------------------------------------------------------------- /Gemfile.lock: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/Gemfile.lock -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/LICENSE -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/README.md -------------------------------------------------------------------------------- /_assets/icons.ai: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_assets/icons.ai -------------------------------------------------------------------------------- /_assets/icons/icon-dribbble.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_assets/icons/icon-dribbble.svg -------------------------------------------------------------------------------- /_assets/icons/icon-facebook.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_assets/icons/icon-facebook.svg -------------------------------------------------------------------------------- /_assets/icons/icon-github.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_assets/icons/icon-github.svg -------------------------------------------------------------------------------- /_assets/icons/icon-instagram.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_assets/icons/icon-instagram.svg -------------------------------------------------------------------------------- /_assets/icons/icon-linkedin.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_assets/icons/icon-linkedin.svg -------------------------------------------------------------------------------- /_assets/icons/icon-pdf.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_assets/icons/icon-pdf.svg -------------------------------------------------------------------------------- /_assets/icons/icon-print.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_assets/icons/icon-print.svg -------------------------------------------------------------------------------- /_assets/icons/icon-twitter.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_assets/icons/icon-twitter.svg -------------------------------------------------------------------------------- /_assets/icons/icon-website.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_assets/icons/icon-website.svg -------------------------------------------------------------------------------- /_assets/resume-web-template.sketch: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_assets/resume-web-template.sketch -------------------------------------------------------------------------------- /_config.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_config.yml -------------------------------------------------------------------------------- /_data/associations.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_data/associations.yml -------------------------------------------------------------------------------- /_data/education.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_data/education.yml -------------------------------------------------------------------------------- /_data/experience.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_data/experience.yml -------------------------------------------------------------------------------- /_data/interests.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_data/interests.yml -------------------------------------------------------------------------------- /_data/links.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_data/links.yml -------------------------------------------------------------------------------- /_data/projects.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_data/projects.yml -------------------------------------------------------------------------------- /_data/recognitions.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_data/recognitions.yml -------------------------------------------------------------------------------- /_data/skills.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_data/skills.yml -------------------------------------------------------------------------------- /_includes/head.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_includes/head.html -------------------------------------------------------------------------------- /_includes/icon-links.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_includes/icon-links.html -------------------------------------------------------------------------------- /_includes/icons/icon-dribbble.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_includes/icons/icon-dribbble.html -------------------------------------------------------------------------------- /_includes/icons/icon-facebook.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_includes/icons/icon-facebook.html -------------------------------------------------------------------------------- /_includes/icons/icon-github.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_includes/icons/icon-github.html -------------------------------------------------------------------------------- /_includes/icons/icon-instagram.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_includes/icons/icon-instagram.html -------------------------------------------------------------------------------- /_includes/icons/icon-linkedin.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_includes/icons/icon-linkedin.html -------------------------------------------------------------------------------- /_includes/icons/icon-pdf.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_includes/icons/icon-pdf.html -------------------------------------------------------------------------------- /_includes/icons/icon-print.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_includes/icons/icon-print.html -------------------------------------------------------------------------------- /_includes/icons/icon-twitter.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_includes/icons/icon-twitter.html -------------------------------------------------------------------------------- /_includes/icons/icon-website.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_includes/icons/icon-website.html -------------------------------------------------------------------------------- /_includes/print-social-links.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_includes/print-social-links.html -------------------------------------------------------------------------------- /_layouts/resume.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_layouts/resume.html -------------------------------------------------------------------------------- /_sass/_base.scss: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_sass/_base.scss -------------------------------------------------------------------------------- /_sass/_layout.scss: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_sass/_layout.scss -------------------------------------------------------------------------------- /_sass/_mixins.scss: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_sass/_mixins.scss -------------------------------------------------------------------------------- /_sass/_normalize.scss: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_sass/_normalize.scss -------------------------------------------------------------------------------- /_sass/_resume.scss: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_sass/_resume.scss -------------------------------------------------------------------------------- /_sass/_variables.scss: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/_sass/_variables.scss -------------------------------------------------------------------------------- /artifacts/add-a-branch.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/artifacts/add-a-branch.png -------------------------------------------------------------------------------- /artifacts/basic-history.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/artifacts/basic-history.png -------------------------------------------------------------------------------- /artifacts/branch-commits.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/artifacts/branch-commits.png -------------------------------------------------------------------------------- /artifacts/deviated-branches.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/artifacts/deviated-branches.png -------------------------------------------------------------------------------- /artifacts/final-merge.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/artifacts/final-merge.png -------------------------------------------------------------------------------- /artifacts/merge-after-conflict.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/artifacts/merge-after-conflict.png -------------------------------------------------------------------------------- /artifacts/merge-simple-master.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/artifacts/merge-simple-master.png -------------------------------------------------------------------------------- /artifacts/no-ff-merge.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/artifacts/no-ff-merge.png -------------------------------------------------------------------------------- /artifacts/reverse-merge-after-conflict.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/artifacts/reverse-merge-after-conflict.png -------------------------------------------------------------------------------- /css/main.scss: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/css/main.scss -------------------------------------------------------------------------------- /favicon.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/favicon.png -------------------------------------------------------------------------------- /images/avatar.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/images/avatar.jpg -------------------------------------------------------------------------------- /images/femalecodertocat.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/images/femalecodertocat.png -------------------------------------------------------------------------------- /images/screenshot.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hpdang/merge-conflicts/HEAD/images/screenshot.png -------------------------------------------------------------------------------- /index.html: -------------------------------------------------------------------------------- 1 | --- 2 | layout: resume 3 | --- --------------------------------------------------------------------------------