DOSSIER 20 / 6 ARTICLES
Git: from snapshots to collaboration and recovery
Build a complete workflow through the object model, local operations, branches, remotes, and recovery.
Start with the first articleFollow the question further.
Understand snapshots, the staging area, and references before completing a local workflow. Organize collaboration with branches and remotes, then handle history and recovery through rebasing, cherry-picking, reflogs, and a scenario handbook. A separate topic covers the GitHub platform.
- 01
Distinguish immutable objects from movable references, and understand garbage-collection and backup boundaries.
Git's underlying model: objects, snapshots, and references
Use snapshots, the object database, and references to understand what Git operations change.
Read article - 02
Trace which content each command changes across the working tree, staging area, and HEAD.
From the first add to undoing a change.
Walk through a local Git workflow: staging, partial commits, diff inspection, restoration, history rewriting, and ignore rules.
Read article - 03
Distinguish fast-forward and three-way merges, and save work in progress before switching or resolving conflicts.
Git branches: merging, conflicts, and saving work in progress
Understand fast-forward and three-way merges, and use stash to manage unfinished work.
Read article - 04
Check remote URLs and refspecs, distinguishing fetches, local updates, and remote pushes.
Remote collaboration with Git: fetching, tracking, and two remotes
Distinguish refreshing references, updating local branches, and pushing to a fork.
Read article - 05
Rewrite only history you have coordinated with others; first protect commits found through reflog with a recovery branch.
Advanced Git: rebasing, cherry-picking, and bisecting
Use rebase, cherry-pick, reflog, and bisect after understanding the boundaries of history rewriting.
Read article - 06
Choose whether to continue, undo, or recover according to status and saved data, rather than blindly using hard reset.
A Git scenario handbook: correcting, undoing, and recovering
Choose a recovery path based on the current operation and what data has been saved, without compounding data loss.
Read article