# krishna81m/merge-conflicts architecture

> Architecture diagram of the GitHub repository krishna81m/merge-conflicts, generated by GitDiagram from its file tree, README and a sample of source files (last updated 2025-05-25). It is an AI-made overview: check details against the source.

- Interactive diagram: https://gitdiagram.com/krishna81m/merge-conflicts
- Repository: https://github.com/krishna81m/merge-conflicts

## Overview

##### 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

## Diagram (Mermaid)

```mermaid
flowchart TB
    %% Source and Version Control
    Developer["Developer Workstation"]:::user -->|commits to| GitHubRepo["Source Repository"]:::code
    click GitHubRepo "https://github.com/krishna81m/merge-conflicts/tree/master//"

    %% Continuous Integration / Local Build
    GitHubRepo --> Build["CI / Local Build"]:::process

    subgraph "Build Process"
        direction TB
        Bundler["Bundler (Gemfile, Gemfile.lock, .bundle/config)"]:::code
        click Bundler "https://github.com/krishna81m/merge-conflicts/tree/master/Gemfile"
        click Bundler "https://github.com/krishna81m/merge-conflicts/blob/master/Gemfile.lock"
        click Bundler "https://github.com/krishna81m/merge-conflicts/tree/master/.bundle/config"

        Jekyll["Jekyll Build Engine"]:::build

        Bundler --> Jekyll

        %% Configuration and Data
        Config["_config.yml"]:::config
        click Config "https://github.com/krishna81m/merge-conflicts/blob/master/_config.yml"
        Data["_data/*.yml"]:::config
        click Data "https://github.com/krishna81m/merge-conflicts/blob/master/_data/*.yml"

        %% Templates
        Layout["_layouts/resume.html"]:::code
        click Layout "https://github.com/krishna81m/merge-conflicts/blob/master/_layouts/resume.html"
        Includes["_includes/"]:::code
        click Includes "https://github.com/krishna81m/merge-conflicts/tree/master/_includes/"

        %% Assets
        Sass["_sass/"]:::code
        click Sass "https://github.com/krishna81m/merge-conflicts/tree/master/_sass/"
        Assets["_assets/"]:::code
        click Assets "https://github.com/krishna81m/merge-conflicts/tree/master/_assets/"
        Images["images/"]:::code
        click Images "https://github.com/krishna81m/merge-conflicts/tree/master/images/"

        %% Entry Point
        Index["index.html"]:::code
        click Index "https://github.com/krishna81m/merge-conflicts/blob/master/index.html"

        %% Data flow into build engine
        Config --> Jekyll
        Data --> Jekyll
        Layout --> Jekyll
        Includes --> Jekyll
        Sass --> Jekyll
        Assets --> Jekyll
        Images --> Jekyll
        Index --> Jekyll
    end

    %% Build Output
    Jekyll --> Artifacts["artifacts/"]:::code
    click Artifacts "https://github.com/krishna81m/merge-conflicts/tree/master/artifacts/"

    Jekyll --> CSSBuild["css/main.scss"]:::code
    click CSSBuild "https://github.com/krishna81m/merge-conflicts/blob/master/css/main.scss"
    Jekyll --> CSSFolder["css/"]:::code
    click CSSFolder "https://github.com/krishna81m/merge-conflicts/tree/master/css/"

    %% Deployment and Serving
    Artifacts -->|deploy| GitHubPages["GitHub Pages CDN"]:::hosting
    click GitHubPages "https://github.com/krishna81m/merge-conflicts/tree/master//"
    GitHubPages --> Browser["End User Browser"]:::user

    %% Styling
    classDef code fill:#D0E8FF,stroke:#025B99,color:#025B99;
    classDef config fill:#FFF4B1,stroke:#AB8A1D,color:#AB8A1D;
    classDef build fill:#D3F7D3,stroke:#1F7A1F,color:#1F7A1F;
    classDef hosting fill:#FFE0B2,stroke:#FF8C00,color:#FF8C00;
    classDef user fill:#F0F0F0,stroke:#888888,color:#888888;
    classDef process fill:#E8E8E8,stroke:#555555,color:#555555;
```
