The Issues Conflict Message Box

This error box appears when there is no way to produce a valid change package entry for an element, by combining your new set of changes with the existing change package entry. The requirement that the basis version must be an ancestor of the head version cannot be fulfilled.

You can remedy this situation by performing a merge An operation that combines the contents of two versions (contributors) of the same element. To merge the contents of text files, AccuRev uses a '3-way merge' algorithm: it compares the two files line-by-line with a third file, the version that is the closest common ancestor of the other two. Merging of namespace changes also takes into account the closest common ancestor. at the element level. (There is no merge operation defined for change package entries.) In the example above, merging version H and version X would create a new version; a change package entry with the new version as its head can be combined with the existing entry.