Ho w to resolve the conflicts in nwdi

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