| Author |
CVS Merge
|
Pallav Bora
Ranch Hand
Joined: Oct 13, 2009
Posts: 73
|
|
Hi ,
I have the following situation regarding merging. Hope I will find an answer here.
I am using CVS (in JDeveloper and in Windows). I have a HEAD and a BRANCH. How do I merge the BRANCH in the HEAD? I don't know how many files were changed in the BRANCH.
Thanks
Pallav
|
 |
Tim Holloway
Saloon Keeper
Joined: Jun 25, 2001
Posts: 14572
|
|
You check out a copy of the HEAD, then run comparisons against a copy of the branch. Merging can be a real pain if there are conflicts.
I don't know if JDeveloper has very much in the way of help for merging. Eclipse does, though.
|
Customer surveys are for companies who didn't pay proper attention to begin with.
|
|
 |
|
|
subject: CVS Merge
|
|
|
0
