Installation and Administration Guide Installation and Administration Guide Getting Started Guide Getting Started Guide Command Line Interface Command Line Interface Configuration Guide Configuration Guide Eclipse Plugin Eclipse Plugin Reference Manual Reference Manual
> Show on single page > Show on multiple pages
Reference Manual > Glossary > Conflict

Conflict

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:

Prev Up Next
Configuration Management System Home | ToC Conformance
Squore 16.3.4
© 2018 Squoring Technologies All rights reserved. This material may not be reproduced, displayed, modified or distributed without the express prior written permission of the copyright holder. Squore is protected by an Interdeposit Certification registered with Agence pour la Protection des Programmes under the Inter Deposit Digital Number IDDN.FR.001.390035.0005.000.S.P.2013.000.10600.