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