In version control software, the forum in which conflicting versions of a contributor are resolved and combined.