Advanced Search

Search Terms

Content Type

Page Chapter
Book Shelf

Exact Matches

Tag Searches

Date Options

Updated after

Updated before

Created after

Created before

Search Results

25 total results found

Rebase

Git & Github

What is git rebase (in plain English)? Rebase takes the commits on your current branch and replays them on top of another commit (often the latest main).This creates a clean, linear history (no merge commits) as if you had started your work from that newer po...

Merge case (you’re merging main into your branch, and want your branch everywhere)

Git & Github

git checkout --ours $(git diff --name-only --diff-filter=U) && git add -A && git commit -m "Resolve conflicts preferring branch changes" && git push

Handling Pull Requests from Forks (Maintainer Guide)

Git & Github

# Handling Pull Requests from Forks (Maintainer Guide) This guide explains how to safely work with PRs created from contributor forks. --- ## 0. On GitHub: Inspect the PR On the PR page, note: - **PR number** – e.g. `#104` - **Source branch**...

New Page

Linux Server

DB File corruption fix

Linux Server SQLite

1) Stop writes + backup # stop the bot/container first cp -a bot.db bot.db.bak.$(date +%Y%m%d-%H%M%S) [ -f bot.db-wal ] && cp -a bot.db-wal bot.db-wal.bak.$(date +%Y%m%d-%H%M%S) [ -f bot.db-shm ] && cp -a bot.db-shm bot.db-shm.bak.$(date +%Y%m%d-%H%M%S) ...