A friendly place for programming greenhorns!
Big Moose Saloon
Register / Login
IDEs, Version Control and other tools
Joined: Oct 13, 2009
Aug 02, 2012 21:06:39
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.
Joined: Jun 25, 2001
Aug 03, 2012 05:08:40
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.
It is sorta covered in the
JavaRanch Style Guide
subject: CVS Merge
Managing changes in SVN/Subclipse
Locking in a CVS branch
best way to check that branches stay in synch?
All times are in JavaRanch time: GMT-6 in summer, GMT-7 in winter
| Powered by
Copyright © 1998-2014