cancel
Showing results for 
Search instead for 
Did you mean: 

NWDI Conflicts while CAF Merge

shreyas_pandya
Contributor
0 Kudos

Hi Experts

We have NWDI server hosting our Composition Environment (CE7.2) source code.

The CE server hosts all the custom developments that include WebDynpro, CAF and BPM projects etc.

We are facing some issues while checking-in the activities that are associatedwith CAF related files.

  1. Common CAF project was checked-out by 2 different Users at the same time.
  2. User-1 Checked-in the activity successfully.
  3. While User-2 checked-in, conflicts appeared. These conflicts were related to the CAF project.
  4. Now, we used the Merge option on the activity to resolve the conflicts. After resolving the conflicts we again tried to check-in the activity.
  5. But, now we are unable to check-in the activity and facing some errors.

I have a backup of the entire workspace folder of the track which is a working copy.

Please guide us how can we replace the version present on DTR with this backup working copy.

Regards,

Shreyas Pandya

Accepted Solutions (1)

Accepted Solutions (1)

shreyas_pandya
Contributor
0 Kudos

The issue was solved by following below mentioned steps.

  1. Remove all the DCs that are showing conflicts from the Local work space by choosing remove from client option as well as from the file system of the track.
  2. Now replace all of them with the same DCs from backup.
  3. Restart your NWDS and log in to the track.
  4. Goto Development Infrastructure perspective and select all DCs that were just replaced.
  5. Right click and chose create project structure.
  6. Now, open DTR perspective and select each DCs at _comp level and chose "Edit subtree"option.
  7. Put the whole DC inside a new activity and check-in.
  8. repeat the same for all DCs that are required to be resolved.

Regards,

Shreyas Pandya

Answers (0)