N/APosted on - 12/03/2012
I get the following error after installing the PureCm client application.
Can anyone help in resolving this issue?
PureCM client warning
W0100 – failed to merge file ‘COPYING’ edit. Failed to find a common base revision.
PureCM client warning – W0100 – failed to merge file
This is correct because PureCM is saying that it can't merge an edit to a file which has not been added.
In order to resolve this issue a developer needs to tell PureCM that file. txt in Version1 is related to file1. txt in Version2.
To do this you must merge the original changes which added file1. text into a Version2 workspace and check the 'Enable Baseless Merge' option.
This will then bring up the Resolve tool allowing you to select the Version1 revision or Version2 revision. After this merge has been submitted
In Version2 PureCM knows that the files are related and you can merge the edit changes without any problems.
Enable to merge below way