Note: This topic discusses conflicts that can occur when two developers change the pathname of an element. The same kind of conflicts can occur when two developers change the target element an
element link or the target pathname of a
symbolic link. The same dialogs appear in both kinds of conflict situations.
In a parallel development environment, namespace changes can overlap in the same way as content changes. For example, you and a colleague might rename the same file in your workspaces:
If your colleague promotes his change first, then the file will get (overlap) status in your workspace. Before you can promote the file, you must use the
Merge command to resolve the namespace conflict.
Any combination of these kinds of changes is possible. AccuRev first prompts you to resolve the namespace conflicts, if any, as described below. Then, it passes control to the Merge tool (or another tool that you've configured), to perform the content merge.
A namespace conflict of the rename kind occurs when two versions' simple names differ from the simple name of their
closest common ancestor (and also differ from each other).

A namespace conflict of the move kind occurs when two versions are located in different directories than their
closest common ancestor (and also different directories from each other).

Note: What are the "EID" annotations? AccuRev tracks directory elements by their immutable
element-IDs (EIDs). It lists the parent directories' EIDs in this dialog to help you identify them; the directories might have different names/pathnames in different streams.