Skip to Content
author's profile photo Former Member
Former Member

Check-In Conflict

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

Add a comment
10|10000 characters needed characters exceeded

Related questions

2 Answers

  • author's profile photo Former Member
    Former Member
    Posted on Aug 02, 2005 at 12:04 PM

    Like it says: External merge/diff tool. So... Google "merge tool" and you'll find lots of them 😊

    Add a comment
    10|10000 characters needed characters exceeded

  • author's profile photo Former Member
    Former Member
    Posted on Aug 03, 2005 at 05:15 AM

    Hi

    I thought the difference tool in NDS can be used for merging (but it seems to replace than merge) . And if you are working with the DTR command line client , it brings up a swing based merge tool.

    Regards

    Pran

    Add a comment
    10|10000 characters needed characters exceeded

    • Former Member Former Member

      IN

      Windows->Prefferences->Team->DTR->ExternalDiff/Merge

      opens a wizard with External diff and External Merge(check boxes)

      I have given the follwoing path

      C:\ProgramFiles\SAP\JDT\eclipse\plugins\com.tssap.dtr.client.vfs\dtrshell.bat

      Now

      Openviews->Activity->Conflict file->rtclick->resolveconflict->

      Merge,Active merge and other options are disabeled

      <b>But in my previous try's it was enabeled</b>

      What may be the reason? Its urgent

      Regards

      RK

      Message was edited by: Ramakrishna Venkat

Before answering

You should only submit an answer when you are proposing a solution to the poster's problem. If you want the poster to clarify the question or provide more information, please leave a comment instead, requesting additional details. When answering, please include specifics, such as step-by-step instructions, context for the solution, and links to useful resources. Also, please make sure that you answer complies with our Rules of Engagement.
You must be Logged in to submit an answer.

Up to 10 attachments (including images) can be used with a maximum of 1.0 MB each and 10.5 MB total.