git-workflow

# Git Workflow ## Overview This skill provides a disciplined, safe workflow for everyday Git: branching, crafting clean atomic commits, rewriting history with interactive rebase, resolving conflicts, and recovering from mistakes using the reflog. The guiding principle is **safety first** — never destroy work you cannot recover, always know your escape hatch before running a history-rewriting command. Keywords: git, branch, commit, rebase, interactive rebase, squash, fixup, reword, cherry-pick, merge, conflict, conflict resolution, reflog, recover lost commits, undo, reset, revert, detached HEAD, force-push, stash, clean history, conventional commits, PR prep. **Golden rules** 1. Never rewrite history that others have already pulled (shared branches like `main`/`develop`). Rewrite only your own unmerged feature branches. 2. Before any `rebase`, `reset --hard`, or force-push, note the current commit: `git rev-parse HEAD` or just trust the reflog — it remembers. 3. Prefer `git push --force-with-lease` over `--force`. It refuses to clobber commits you haven't seen. 4. Commit early, commit often locally; clean up into atomic commits before sharing. 5. If something looks lost, it almost certainly isn't — go to `git reflog` (see references/reflog-recovery.md). ## Workflow ### 1. Orient before acting Always understand current state first: ``` git status # working tree + branch git log --oneline -10 # recent history git branch -vv # branches + tracking ``` ###...