Development on homelab

Git Push Authentication

Fri, 01 May 2026 00:00:00 +0000

Git Push Authentication#

What Was Established#

Patterns for resolving Git push authentication issues and handling divergent branches when working across multiple machines.

Key Decisions#

Multi-machine workflow: Always git pull before starting work; commit and push when done.
Divergent branch resolution: When local and remote have diverged, use git pull --no-rebase (merge) for safety or git fetch origin && git reset --hard origin/main to discard local commits for remote-only state.

Resolving Divergent Branches#

Symptom#

hint: You have divergent branches and need to specify how to reconcile them.
fatal: Need to specify how to reconcile divergent branches.

Option 1: Merge (preserves both histories)#

git pull --no-rebase
# Or set as default:
git config pull.rebase false

Option 2: Rebase (local commits on top of remote)#

git pull --rebase
# Or set as default:
git config pull.rebase true

Option 3: Discard local, use remote only#

git fetch origin
git reset --hard origin/main

Option 4: Fast-forward only (fails if diverged)#

git pull --ff-only

Multi-Machine Workflow#

When working from multiple machines on the same repo:

Hugo Git Submodule Extraction Pattern

Fri, 01 May 2026 00:00:00 +0000

Hugo Git Submodule Extraction Pattern#

What Was Established#

Hugo themes installed as Git submodules (e.g., git submodule add <url> themes/theme-name) carry their own Git history. When you want to customize the theme beyond configuration, extracting the submodule into the main repository gives you full control over theme files without managing a separate submodule repository.

The Pattern#

Remove the submodule registration:

git submodule deinit themes/theme-name
git rm themes/theme-name

Re-add the theme as regular files:

git clone <theme-url> /tmp/theme-temp
cp -r /tmp/theme-temp/* themes/theme-name/
git add themes/theme-name/
git commit -m "Extract theme-name from submodule into main repo"

Result: Theme files are now tracked directly in the main repository.

When to Use#

You need to modify theme templates, layouts, or partials beyond what config allows
The upstream theme is stable and you don’t need to pull updates
You want simpler CI/CD without recursive submodule clones

When Not to Use#

The theme receives frequent updates you want to track
You only need CSS overrides (use assets/ or static/ instead)

Git Push Authentication, Ilmarë Website, Self-Hosted CMS Options & Landscape

VS Code Live Server Path Configuration

Mon, 31 Mar 2025 00:00:00 +0000

VS Code Live Server Path Configuration#

What Was Established#

Resolved the “Cannot GET /page-name” error in VS Code Live Server by implementing a standardized project directory structure and correct relative pathing. The core fix involves ensuring the server root is set to the project root and using ../ to traverse up from subdirectories.

Key Decisions#

Project Rooting: Always open the top-level project folder in VS Code rather than individual subfolders (like html/). This allows Live Server to correctly resolve paths relative to the project root.
Directory Separation: Adopted a structured hierarchy to separate assets, logic, and presentation.

Current Configuration#

Project Structure#

project-root/
├── Assets/
│   ├── icons/
│   └── images/
├── html/
│   ├── index.html
│   ├── about.html
│   └── contact.html
├── scripts/
│   └── main.js
└── Styles/
    └── style.css

Pathing Rules (when working inside `html/`)#

When files are located within the html/ subdirectory, all links to external directories must use the ../ prefix to exit the html/ folder first.

Development on homelab

Git Push Authentication

Git Push Authentication#

What Was Established#

Key Decisions#

Resolving Divergent Branches#

Symptom#

Option 1: Merge (preserves both histories)#

Option 2: Rebase (local commits on top of remote)#

Option 3: Discard local, use remote only#

Option 4: Fast-forward only (fails if diverged)#

Multi-Machine Workflow#

Hugo Git Submodule Extraction Pattern

Hugo Git Submodule Extraction Pattern#

What Was Established#

The Pattern#

When to Use#

When Not to Use#

Related Pages#

VS Code Live Server Path Configuration

VS Code Live Server Path Configuration#

What Was Established#

Key Decisions#

Current Configuration#

Project Structure#

Pathing Rules (when working inside html/)#

Pathing Rules (when working inside `html/`)#