Check-In Conflict

164 Views

In Sceanrio-1,

1. User 1 checks out a resource.

2. User 2 checks out the same resource.

3. User 1 makes the changes and checks in the activity.

4. User 2 makes the changes and tries to check in the activity

I am getting this Error

17:19:41.783 UPLOAD (SKIPPED: File was not changed since last upload/download: last change on Tue Aug 02 16:27:17 IST 2005) Hello.java (C:JDIDemoDemoWSDemoFolderHello.java)

17:19:41.923 CHECKIN (FAILED: Got check-in conflicts) Activity2 (act_w_Demo_DemoWS_u_cmsdev1_t_2005_08_02_10_56_52_GMT_54fad87f-472a-4ba2-bb2b-7d61f7572fb5)

Files with check-in conflict:

--- Problem summary: ---

17:19:41.923 CHECKIN (FAILED: Got check-in conflicts) Activity2 (act_w_Demo_DemoWS_u_cmsdev1_t_2005_08_02_10_56_52_GMT_54fad87f-472a-4ba2-bb2b-7d61f7572fb5)

17:19:41.970 ==> Finished in 266ms. 1 file skipped (591 bytes).

If i see Resolving Check-in Conflicts Document it mentions

Make Merge settings in the menu of the SAP NetWeaver Developer Studio under Window ® Preferences ® Team ® DTR Preferences. There, you can select an external merge tool and an external diff tool.(

What are these tools where will i get these Tools?)
a. To merge the contents, choose one of the following options in the context menu: i. Merge...

or

ii.Auto Merge.

Thanks in Advance

RK