Git

Version control for working in a team ·

Read in order: each page builds on the one before. Page 1's "four places" picture is the key to all the rest.

• Where your changes live: add, commit, status, diffWorking tree → staging → commits → remote
• Sharing: remote, push, pull, fetch, cloneWhy a push gets rejected; never force-push main
• Branches, merging and conflictsBranches are labels; fast-forward vs merge commit; resolving conflicts
• Pull requests and code reviewThe team workflow; squash vs merge; writing a reviewable PR
• Searching: grep, log, blame, bisectFind code now, and find when and why it changed
• Undoing things safelyrestore, amend, reset vs revert, the reflog safety net
• Git in Unreal teams: binaries, LFS, locking, PerforceWhy .uasset is different, and what studios use
• Perforce refresherWorkspaces, checkout, changelists, shelving, streams, the "revert" trap