Real Conflicts vs Mergeable Conflicts
There are two types of conflicts:
- real conflict (
icon in
Name column) - Syncro SVN Client considers the following resource states
to be real conflicts:
- conflicted state - A file reported by SVN as being in this state is obtained
after it was updated/merged while having incoming and outgoing content or property
changes at the same time, changes that could not be merged. A content conflict (
icon in Local file status column) is
reported when the modified file has binary content or it is a text file and both local
and remote changes were found on the same line. A properties conflict (
icon in Local properties status
column) is reported when a property's value was modified both locally and
remotely.
- tree conflicted state (
icon
in Local file status column) - Obtained after an update or merge operation,
while having changes at the directory structure level (for example, file is locally
modified and remotely deleted or locally scheduled for deletion and remotely
modified).
- obstructed state (
icon in
Local file status column) - Obtained after a resource was versioned as one
kind of object (file, directory, symbolic link), but has been replaced outside Syncro
SVN Client by a different kind of object.
- conflicted state - A file reported by SVN as being in this state is obtained
after it was updated/merged while having incoming and outgoing content or property
changes at the same time, changes that could not be merged. A content conflict (
- pseudo-conflict (
icon in
Name column) - A file is considered to be in pseudo-conflict when it
contains both incoming and outgoing changes. When incoming and outgoing changes do
not
intersect, an update operation may automatically merge the incoming file content into
the
existing locally one. In this case, the pseudo-conflict marker is removed. This
marker is used only as a warning that should prevent you to run into a real conflict.
Note
- A conflicting resource cannot be committed to repository. You have to resolve it first, by using Mark Resolved action (after manually editing/merging file contents) or by using Mark as Merged action (for pseudo-conflicts).
- and icons are presented only when one of
the following view modes is selected: Modified,
Incoming, Outgoing,
Conflicts.
- The icon is used also for
folders to signal that they contain a file in real conflict or pseudo-conflict
state.