How krishna81m/merge-conflicts works
Project type and purpose
• This is a static site (a resume/portfolio) powered by Jekyll.
File structure
• Top‐level build/config files:
• Gemfile / Gemfile.lock – Ruby/Bundler dependencies for Jekyll
• .bundle/config – Bundler settings
• _config.yml – Jekyll site configuration
• Content and data:
• index.html – entry-point layout or home page
• _data/*.yml – structured resume data (experience, skills, education, etc.)
• Layouts & includes:
• _layouts/resume.html – the main HTML skeleton for every page
• Assets:
• _sass/*.scss and css/main.scss – styling and mixins
• Output / artifacts:
• artifacts/ and css/ (post-build) – compiled HTML/CSS for deployment
README for additional context
• The README indicates this repository is used in a GitHub Learning Lab course to practice merges in a static site context.
a. Main components to represent:
• Developer workstation
• Source repository (GitHub)
• Jekyll build engine (local or CI)
• Data layer (YAML files)
• Template layer (_layouts & _includes)
• Static site output (HTML, CSS in artifacts/)
• Hosting layer (GitHub Pages / CDN)
• End user (browser)
b. Relationships and interactions:
1. Developer edits files → commits to GitHub repo
2. On push, CI (or GitHub Pages) invokes Bundler → installs gems → runs Jekyll
3. Jekyll reads:
– _config.yml (site settings)
– _data/*.yml (content)
– _layouts + _includes (templates)
– assets (_sass, images)
4. Jekyll outputs static HTML/CSS into an artifacts folder
5. Artifacts are deployed to GitHub Pages CDN
6. End user’s browser requests HTML/CSS → delivered from CDN
c. Architectural patterns & design principles:
• Static site generator (pre‐rendered HTML for performance & security)
• Separation of concerns: data vs. templates vs. styling vs. build logic
• Convention over configuration (Jekyll folder naming)
• Asset compilation using SASS pipeline
d. Relevant technologies:
• Ruby & Bundler (Gemfile)
• Jekyll (_config.yml, _layouts, _includes, _data)
• SCSS/SASS compiler
• GitHub Pages / Actions (CI/CD)
• Git for version control