Conflict

From Maisqual Wiki

Jump to: navigation, search


A change in one version of a file that cannot be reconciled with the version of the file to which it is applied. [ ISO/IEC/IEEE 24765 ]

Notes

  • Conflicts can occur when versions from different branches are merged or when two committers work concurrently on the same file. [ ISO/IEC/IEEE 24765 ]

See also

Glossary:

Standards:

Personal tools