- Does it cover rebase and merge conflicts?
- Yes — both the common commands and how to resolve conflicts. Plus undo operations (reset vs revert vs reflog).
- What about git flow or trunk-based development?
- Workflow-agnostic. Individual commands are covered; the cheatsheet stays away from opinionated branching models.
- Is it safe to run these commands on shared branches?
- Destructive ones (force-push, rebase on shared branches) are marked with warnings. Read the warnings before running.
- Does it show modern features (git switch, git restore)?
- Yes — the newer commands are listed alongside their older equivalents (checkout), which many people still use.