Resolve Merge Conflicts for CWS Integration

How do I resolve merge conflicts for CWS integration?

When your CWS has been approved by QA you can help integrating it into the master workspace by solving possible merge conflicts in advance. First check whether there are conflicts:

cwsanalyze all

(you have to do this in a scratch directory, not on you CWS).

If there are conflicts, for any conflicting file do (on your CWS, not in the scratch directory where you just did cwsanalyze)

> cd path_to_your_file
path_to_your_file> cwsresync -m HEAD filename

Resolve conflicts, then check in your changes with

path_to_your_file> cwsresync -c filename