"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
_______________________________________________
Info-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/info-cvs
