Definicja edit merge
The content of the target version of the merge relation is a result of merging its edit merge predecessor version with the immediate predecessor version in the same branch. This type of merge relation is created whenever several persons check out a file. The second person who checks in his or her version must execute the merge and create an edit merge relation.
Słownik i definicje SAPa na E.