Version Control with Git & Remote Repositories

# --- Step 1: Operating System Installation ---
# Windows (via Windows Package Manager Winget or Git for Windows installer)
winget install --id Git.Git -e --source winget

# macOS (via Homebrew)
brew install git

# Ubuntu / Debian Linux
sudo apt update && sudo apt install -y git

# --- Step 2: Establish Cryptographic Committer Identity ---
git config --global user.name "Shivan Kumar"
git config --global user.email "shivan@devascent.me"

# --- Step 3: Production Engineering Baseline Settings ---
# Standardize default branch name to 'main' (industry standard)
git config --global init.defaultBranch main

# Handle Line Endings: CRLF (Windows) vs LF (Unix/macOS/Linux servers)
# Windows developers set true to convert LF on checkout and CRLF on commit:
git config --global core.autocrlf true
# macOS/Linux developers set input:
# git config --global core.autocrlf input

# Set default terminal editor (VS Code)
git config --global core.editor "code --wait"

# --- Step 4: Verify Effective Configuration Hierarchy ---
git config --list --show-origin

# Create project folder and step inside
mkdir devascent-portal && cd devascent-portal

# Initialize empty Git repository
git init

# Inspect the internal structure of the .git directory
ls -la .git

# Key directories created:
# .git/HEAD         -> Pointer to the currently active branch (e.g., ref: refs/heads/main)
# .git/config       -> Local repository-specific configurations
# .git/objects/     -> All content-addressable blobs, trees, and commits
# .git/refs/        -> Branch heads (refs/heads/) and tags (refs/tags/)
# .git/hooks/       -> Client and server-side lifecycle automation scripts

# Plumbing command: inspect any object type and content directly
# git cat-file -t <hash>   (shows object type: commit, tree, blob)
# git cat-file -p <hash>   (pretty-prints object contents)

# Create a production .gitignore to prevent committing build artifacts and secrets
cat << 'EOF' > .gitignore
# Dependencies
node_modules/
.pnp
.pnp.js

# Environment Variables & Secrets
.env
.env.local
.env.*.local
*.pem

# Build outputs & Caches
dist/
build/
.next/
.cache/
*.log

# Operating System metadata
.DS_Store
Thumbs.db
EOF

# Create source files
echo "<!DOCTYPE html><html><body><h1>DevAscent</h1></body></html>" > index.html
echo "console.log('App initialized');" > app.js

# Check status before staging (shows Untracked files)
git status -s

# Stage specific files (moves Working Tree -> Index)
git add index.html app.js .gitignore

# Or stage interactively (patch mode: review chunk-by-chunk)
# git add -p

# Commit staged snapshot with an atomic Conventional Commit message
git commit -m "feat(core): scaffold initial web landing page and application bootstrap"

# Verify status after commit (clean working tree)
git status

# 1. Standard one-line summary log
git log --oneline

# 2. Production Graph View: visualizes branch topologies, forks, and merges
git log --graph --oneline --decorate --all

# 3. Filter history by file modifications
git log -p -2 app.js  # View last 2 commits with full patch diffs for app.js

# 4. Search history by commit message content
git log --grep="scaffold" --oneline

# 5. Search who touched which line of a file (Provenance tracking / Blame)
git blame index.html

# 6. EMERGENCY RECOVERY: The Reference Log (reflog)
# Even if you delete a branch or perform an accidental hard reset,
# reflog stores the absolute history of where HEAD has pointed locally for 90 days.
git reflog

# List all local branches (* indicates currently checked-out branch)
git branch

# Modern syntax: Create and immediately switch to a new feature branch
git switch -c feature/navbar-redesign

# (Legacy equivalent: git checkout -b feature/navbar-redesign)

# Switch back to the main branch
git switch main

# Delete a merged branch safely (-d prevents deleting unmerged work)
git branch -d feature/navbar-redesign

# Force-delete an abandoned branch with unmerged commits (-D)
# git branch -D feature/abandoned-experiment

# Rename active branch locally
git branch -m feature/navbar-v2

# Step 1: Ensure you are on the receiving branch
git switch main

# Step 2: Merge feature branch into main
# By default, Git performs a fast-forward if possible:
git merge feature/user-profile

# Production Tip: Force a non-fast-forward merge commit (--no-ff)
# This guarantees that the group of feature commits is visually encapsulated:
git merge --no-ff feature/user-profile -m "merge: integrate user profile module into main"

# Alternative: Squash Merge (compresses entire feature branch into 1 commit)
# git merge --squash feature/user-profile

# --- Scenario: Merge halts with conflict ---
git merge feature/billing-v2

# Check status to identify unmerged paths (both modified)
git status

# --- Inside config.js, Git injected markers: ---
# <<<<<<< HEAD
# const API_URL = "https://api.devascent.me/v1";
# =======
# const API_URL = "https://billing-api.devascent.me/v2";
# >>>>>>> feature/billing-v2

# --- Resolution: Edit file to combine or select the proper production logic ---
# Replace with resolved code:
# const API_URL = process.env.NODE_ENV === "production" 
#   ? "https://billing-api.devascent.me/v2" 
#   : "https://api.devascent.me/v1";

# Stage the resolved file (signals Git the conflict is resolved)
git add config.js

# Finalize the merge commit
git commit -m "merge: resolve API_URL configuration collision between main and billing-v2"

# Emergency Escape Hatch: If you want to abort the merge entirely:
# git merge --abort

# Link local repository to a remote GitHub repository
git remote add origin https://github.com/shivan632/devascent-portal.git

# Verify registered remote endpoints
git remote -v

# First push: establish upstream tracking link (-u or --set-upstream)
git push -u origin main

# Once tracking is set, future pushes require only:
git push

# Fetch metadata safely without merging
git fetch origin

# Clean pull with rebase to maintain a linear history
git pull --rebase origin main

# SAFE FORCE-PUSHING: Never use 'git push --force' on shared branches!
# If you rebased your feature branch, use --force-with-lease.
# It refuses to overwrite the remote branch if someone else pushed new commits:
git push --force-with-lease origin feature/navbar

# --- Step 1: Generate High-Security Ed25519 SSH Key Pair ---
ssh-keygen -t ed25519 -C "shivan@devascent.me"

# Start ssh-agent in background and register private key
eval "$(ssh-agent -s)"
ssh-add ~/.ssh/id_ed25519

# Print public key to copy into GitHub -> Settings -> SSH Keys
cat ~/.ssh/id_ed25519.pub

# Test authenticated SSH connection with GitHub servers
ssh -T git@github.com

# --- Step 2: Open Source Forking & Dual Remote Setup ---
# Clone your personal fork
git clone git@github.com:shivan632/devascent-academy.git && cd devascent-academy

# Add 'upstream' pointing to the original parent organization repository
git remote add upstream git@github.com:devascent-org/devascent-academy.git

# Sync local fork with upstream main changes
git fetch upstream
git switch main
git merge upstream/main

# --- Step 1: Initialize New Project & Baseline ---
mkdir devascent-enterprise-app && cd devascent-enterprise-app
git init
git branch -M main

# Setup .gitignore
echo "node_modules/" > .gitignore
echo ".env" >> .gitignore

# Base index file
cat << 'EOF' > index.html
<!DOCTYPE html>
<html>
<head><title>DevAscent App</title></head>
<body>
  <header id="app-header">Standard Header</header>
  <main id="content">Welcome to DevAscent</main>
</body>
</html>
EOF

git add .
git commit -m "chore(init): initial commit with baseline index markup and gitignore"

# --- Step 2: Author Feature on Isolated Branch ---
git switch -c feat/dynamic-header

# Update header in feature branch
cat << 'EOF' > index.html
<!DOCTYPE html>
<html>
<head><title>DevAscent App</title></head>
<body>
  <header id="app-header" class="dynamic-pro">Enterprise Dynamic Header v2</header>
  <main id="content">Welcome to DevAscent</main>
</body>
</html>
EOF

git add index.html
git commit -m "feat(ui): upgrade header component to dynamic enterprise design"

# --- Step 3: Simulate Parallel Teammate Commit on Main ---
git switch main

# Teammate updated the exact same line with their version:
cat << 'EOF' > index.html
<!DOCTYPE html>
<html>
<head><title>DevAscent App</title></head>
<body>
  <header id="app-header" class="teammate-patch">Teammate Urgent Header Fix</header>
  <main id="content">Welcome to DevAscent</main>
</body>
</html>
EOF

git add index.html
git commit -m "fix(header): urgent telemetry branding patch on main"

# --- Step 4: Attempt Merge & Encounter Conflict ---
git merge feat/dynamic-header

# Terminal notifies: CONFLICT (content): Merge conflict in index.html
# Let's inspect conflict state:
git status

# --- Step 5: Resolve Conflict Manually ---
# Combine the best of both: Keep dynamic styling with telemetry patch:
cat << 'EOF' > index.html
<!DOCTYPE html>
<html>
<head><title>DevAscent App</title></head>
<body>
  <header id="app-header" class="dynamic-pro teammate-patch">Enterprise Dynamic Header with Telemetry</header>
  <main id="content">Welcome to DevAscent</main>
</body>
</html>
EOF

# Stage and complete merge commit
git add index.html
git commit -m "merge: resolve header collision between main and dynamic-header"

# --- Step 6: Create Semantic Release Tag ---
git tag -a v1.0.0 -m "Release v1.0.0: Production-ready enterprise core"

# --- Step 7: Inspect Complete Historical DAG ---
git log --graph --oneline --decorate --all