Merging Glossary

Browse 2 merging terms defined in plain English, from the cultural dictionary of computing.

2 Merging Terms

Conflict: A situation in which two changes, operations, or states are incompatible and cannot be combined automatically without deciding which behavior should win....
Upstream Merge: The act of merging changes from an upstream project into a downstream fork, branch, or maintained copy. In long-lived forks, upstream merges are where...