During the Merge process on a package in the Development state, the error message appears:
- E0302014f: The parent version of the item web.xml has another child on the trunk: Synchronization problem.
Checking the file, we found that there is a branch number like 22.2.1 listed in the package, but the history diagram does not show the previous version 22.1.1
Reason for this behavior:
A few users have checked-out and checked-in the same files several times in the Merge state. One of the users demoted the package from the Merge state to the Development state. But the Merge and Development states have different underlying data views, the Merge data view for the Merge state, and the Production data view for the Development state. If you click on the History Diagram, the later versions of these files are not visible in the Development state because they were checked-in in the Merge state. When the package was demoted to the Development state, this does not allow the later versions of these files to become "visible" in the Development state. You can prevent this problem by enabling dependency checking during the demote process.
A workaround for the problem is to "promote" the package from the Merge state to the Development state. By doing this, a copy of the correct version of the file is placed in the Development state, and subsequent attempts to check out or merge this file can be successful.