Ho w to resolve the conflicts in nwdi

[Former Member]

Hi Experts,

I need this info very urgently .

I have checked out the files and did the changes when i try to check in there is conflicts in some files and it is different from the version/file i checked out for editing.Now i want to merge my code to the active version instead of completly replacing it with my changes.

NWDS version is 7.0

Please help.

Thanks and Regards

Nithya

[former_member193379]

Hi Nithya,

In SAP NetWeaver Developer Studio, the user of the conflicting file logs on to the development configuration of the consolidation phase. Now checks for conflict and now creates a project containing the file in conflict.

Thanks,

Hamendra

[junwu]

totally wrong steps....

his code is not checked in yet......

[former_member193379]

Hi Jun,

Nithya's code is already containg conflict and for this he needs to follow the above step or he can first get the conflect report.

Thanks,

Hamendra

[junwu]

This message was moderated.

[junwu]

Check-In Conflicts - Scenario “Developing Components with the NWDI“ - SAP Library

[junwu]

just merge it....what's the big deal

where you stuck?