[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Merging
|
From: |
Alex Flores |
|
Subject: |
Merging |
|
Date: |
Thu, 14 Jun 2001 08:57:26 -0500 |
Can somebody give me
advice on how to resolve merging conflicts using CVS120 with a 1.2 patch.
The only difference between the main trunk and the branch is some comments that
I added. I tried to resolve the conflict by deleting the comments on both
the main and the branch but I still get a conflict.
Thanks,
Alex
Flores