Real Conflicts vs Mergeable Conflicts

There are two types of conflicts:
  • 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 decorators are presented only when one of the following view modes is selected: Modified, Incoming, Outgoing, Conflicts.
  • The marker is used also for folders to signal that they contain a file in real conflict or pseudo-conflict state.