Game dev
Saved & recent

Branch

Related terms: merge, main, feature branch, commit

A separate line of development. A team can work on a new movement system while the main line receives bug fixes. In Git, the branch name points to a commit and moves forward as new commits are made.

A merge combines lines of development. If their edits cannot be combined automatically, a merge conflict needs a decision. Short, focused branches generally leave less diverging work to reconcile.

Further reading
Pro Git: Branches in a Nutshell
A B C D E M main movement branch merge commit branch point main tip
Movement work branches from commit B while main advances to C. The merge combines C with E and becomes the new tip of main.

View in the full Game dev collection