This week's book giveaway is in the Jobs Discussion forum.
We're giving away four copies of Customer Requirements for Developers and have Marcho Behler on-line!
See this thread for details.
The moose likes IDEs, Version Control and other tools and the fly likes CVS Merge Big Moose Saloon
  Search | Java FAQ | Recent Topics | Flagged Topics | Hot Topics | Zero Replies
Register / Login

Win a copy of Customer Requirements for Developers this week in the Jobs Discussion forum!
JavaRanch » Java Forums » Engineering » IDEs, Version Control and other tools
Bookmark "CVS Merge" Watch "CVS Merge" New topic

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.


Tim Holloway
Saloon Keeper

Joined: Jun 25, 2001
Posts: 16908

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.
With a little knowledge, a cast iron skillet is non-stick and lasts a lifetime.
subject: CVS Merge
It's not a secret anymore!