2.1 Git
Every entry filed under Git and its subtopics.
Platform
Clear filters
5 entries match these filters
- 0034 Merging vs rebasing in Git Merge and rebase both bring commits from one branch into another. Merge keeps history exactly as it happened; rebase replays your commits… Intermediate · Concept · Any system Article Branching & rebasing 15 Oct 2026
- 0035 Undoing changes in Git: restore, reset, revert, and reflog Pick the undo command by where the mistake lives: in a file, in the staging area, in a local commit, or in… Intermediate · Concept · Any system Article Undoing changes 15 Oct 2026
- 0041 Fix: CONFLICT (content): Merge conflict in … Two branches changed the same lines and Git cannot choose for you. Open the file, keep the right text, remove the markers,… Intermediate · Fix · Any system Article Branching & rebasing · Common errors 15 Oct 2026
- 0042 Fix: fatal: refusing to merge unrelated histories Your local repository and the remote do not share a single commit, usually because both were started separately. Allow the one-time merge,… Intermediate · Fix · Any system Article Common errors 15 Oct 2026
- 0043 Delete local branches that are already merged A bash script that lists local branches fully merged into main and, if you ask, deletes them. It never touches the current… Intermediate · How-to · Linux, macOS, Windows Script Housekeeping 15 Oct 2026