[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merge issues with CVS
|
From: |
Larry Jones |
|
Subject: |
Re: Merge issues with CVS |
|
Date: |
Thu, 24 Mar 2005 18:31:06 -0500 (EST) |
"SUBRAMANIAN, SARAVANAN (SBCSI)" writes:
>
> We use branches in CVS, When we do merge the conflicted files which are
> merged earlier appears again and again.
> How to solve this issue.
Don't keep merging the same changes over and over:
<https://www.cvshome.org/docs/manual/cvs-1.11.19/cvs_5.html#SEC61>
-Larry Jones
Please tell me I'm adopted. -- Calvin
- Merge issues with CVS, SUBRAMANIAN, SARAVANAN \(SBCSI\), 2005/03/24
- Re: Merge issues with CVS,
Larry Jones <=