[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Merge conflict - please help.
From: |
Dewan, Mohit |
Subject: |
RE: Merge conflict - please help. |
Date: |
Tue, 21 Sep 2004 08:05:51 -0700 |
I have been using tkCVS/tkDiff so far but that doesn't solve the
problem. What I don't understand is that why conflicts show up on
certain files only. Not sure if I am doing something wrong.
-----Original Message-----
From: address@hidden
[mailto:address@hidden
Sent: Tuesday, September 21, 2004 5:23 AM
To: Dewan, Mohit; address@hidden
Subject: RE: Merge conflict - please help.
Use tkCVS or the like to resolve your conflicts.
>-----Original Message-----
>From: address@hidden
>[mailto:address@hidden
>] On Behalf Of Dewan, Mohit
>Sent: Monday, September 20, 2004 6:22 PM
>To: address@hidden
>Subject: Merge conflict - please help.
>
>
>Hi,
>
>Am trying to merge code from different releases on a vendor
>branch with the main trunk. Its giving conflicts on some
>files yet some files merge just fine. Please see attachment
>for my scenario.
>
>The main trunk is on the left and version 1.1.1 and up are
>vendor versions. Am attempting to merge code from version
>1.1.1.1 to 1.1.1.3 with revision 1.2 (on trunk) to make revision 1.3.
>
>Version 1.1.1.1 has the tag v13_01
>Version 1.1.1.3 has the tag v19_05
>Module name: md
>
>The command I am using (from my working directory) is:
>cvs checkout -kk -j v13_01 -j v19_05 md
>
>I get a conflict while doing the above. Once again, the
>conflict comes up with some files but others (within the same
>directory) merge just fine.
>
>Any ideas/hints will be appreciated.
>
>
>
>Mohit Dewan
>