This week's book giveaway is in the Clojure forum.
We're giving away four copies of Clojure in Action and have Amit Rathore and Francis Avila on-line!
See this thread for details.
Win a copy of Clojure in Action this week in the Clojure forum!
  • Post Reply
  • Bookmark Topic Watch Topic
  • New Topic

CVS Merge

 
Pallav Bora
Ranch Hand
Posts: 73
  • 0
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
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
Pie
Posts: 17639
39
Android Eclipse IDE Linux
  • 0
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
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.
 
I agree. Here's the link: http://aspose.com/file-tools
  • Post Reply
  • Bookmark Topic Watch Topic
  • New Topic