Glossaria.net

Glossary Git / Term

merge

As a verb: To bring the contents of another branch (possibly from an external repository) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first fetching the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a pull. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge.

As a noun: unless it is a fast-forward, asuccessful merge results in the creation of a new commitrepresenting the result of the merge, and having asparents the tips of the merged branches.This commit is referred to as a "merge commit", or sometimes just a"merge".

Permanent link merge - Creation date 2023-07-26


< master Glossary / Git object >