on 08-02-2005 12:53 PM
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
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
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Hi,
Windows->Prefferences->Team->DTR->ExternalDiff/Merge
opens a wizard with External diff and External Merge(check boxes)
right now i am using guiffy (trail vesrion).
Infact i am working with DTR command client also.
U mean to say browse and put that DTR command exe for both
External diff and External Merge.
Regards,
RK
Thanks Pran
Finally its working!
But there are options
A)Merge ( Merges local version)
B)Auto Merge (Merges with Remote version)
How about Locally (user1) I have a method
Remote (User2) checked in to Repository Method 2
If Option A, then i will not be updating Method 2
If Option A, then i will loosing Method 1
How do you merge so that both methods should be availble in the latest version.
(Will you say Third party tool only the Solution)
++++++++++++++++++++++++++++++++++++
One more point if i compare code with Browse to file in DTR -> Right click -> Show Revision history (this will show u the versions of the file) -> Select two files , right click and say show difference.
I should disabel Windows->Prefrenxes->Team->DTR->External diff/Merge check boxes.
while merging i should enabel this, then do the merge options.
Regards,
RK
Hi Ram
Thats where I got stuck , after hours on it for creating a conflict , I finally launch the tool only to find the tool does not do a merge and only a replace , so I have no answer for this . So I am trying to perform a conflict resloution through command line client which seems to have a tool of its own and see if this supports actual merging.
Regards
Pran
Hi RK and Pran,
The builtin tool in NWDS does a merge as well.
On a file with checkin conflict, when you choose the "Merge..." option in the context menu, you will get a merge dialog displaying three versions: your version (checked-out by you), remote version (currently active in this workspace), and a Common Ancestor of these two versions.
You can use this 3-way merge dialog to merge changes into your checked out version. (Note: If you do not see the third pane initially, use the button on the toolbar to "Show Ancestor Pane".)
Regards,
Manohar
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
Like it says: External merge/diff tool. So... Google "merge tool" and you'll find lots of them
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
I'm using Compare It! http://www.grigsoft.com/wincmp3.htm
I've heard/read that Araxis Merge is one of the best: http://www.araxis.com/merge/
Message was edited by: Pascal Willemsen
User | Count |
---|---|
73 | |
26 | |
10 | |
9 | |
7 | |
6 | |
4 | |
4 | |
4 | |
4 |
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.