Merge Issues

All, We have two Branches, Head and Branch A. Branch A is created in order to help defect fixes. We use to merge from Branch A to Head on a weekly basis. After we merge we used to create a version tag in Branch A, which will be used as the Starting point for the next merge. Now here comes the issu

Re: Merge issues with CVS

"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:

Merge issues with CVS

Hi All 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. Example :- A file called Demo.java merged after resolving conflicts. When we try to merge Demo1.java , Demo.java also appears how to avoid this problem.

Re: Merge issues.

Tawfik, Sameh E writes: > > This is a multi-part message in MIME format. Please do not send MIME and/or HTML encrypted messages to the list. Plain text only, PLEASE! > Q1. Are there any thing wrong with the above merge command? Or is there > is any other command I should be using instead? Looks

Re: Merge issues.

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Tawfik, Sameh E <[EMAIL PROTECTED]> writes: > About a month ago I tagged the main line with > "Release_2_2_0 " tag, and then from that tag I Note: spaces are not really included in the tag name... > made a new branch "Release_2_2_0_Branch". > > >

Merge issues.

Hi,   About a month ago I tagged the main line with “Release_2_2_0 “ tag, and then from that tag I made a new branch “Release_2_2_0_Branch”.   Now, I’m trying to merge from the branch to the main line, but it seems either I’m using the wrong syntax to the update command or there is a bu

merge issues

[EMAIL PROTECTED] writes: > > We are using CVS version 1.10 running on Solaris 2.8. > A 'problem' occured when CVS merged a file multiple users had checked out and > altered. ... > Please help. Our understanding of CVS's merge function should have caught these > differences. Is our understandin

Re: merge issues

[EMAIL PROTECTED] writes: > > We are using CVS version 1.10 running on Solaris 2.8. You may want to consider upgrading to the current release (1.11.1p1, or at least 1.11), which you can get from www.cvshome.org. > A 'problem' occured when CVS merged a file multiple users had checked out and > a

merge issues

We are using CVS version 1.10 running on Solaris 2.8. A 'problem' occured when CVS merged a file multiple users had checked out and altered. All effected lines were in the original version in the repository. Issue 1: User 1 changed line 1 in the file. User 2 changed last line in the file. No conf