A merge is the act of combining two sets of changes in a source code repository. Sometimes, a merge results in a conflict, which must be resolved.