How do I merge a CVS branch into HEAD using the Eclipse merge tools?

Asked 2009-02-09T22:02:03.547

38

I'm currently working in a branch I created using the Team-->Branch. How do I use Team-->Merge to merge my changes to the branch back to head?

java eclipse merge cvs

Edit Report

1 Answer

6

I agree this is working other way around, if changes in YOUR_BRANCH needs to be updated to HEAD,

1) commit changes to YOUR_BRANCH 2) swap local branch to HEAD 3) merge HEAD witch changes made in YOUR_BRANCH

therefore you need to be in HEAD and "take" changes from YOUR_BRANCH (instead of sending changes from YOUR_BRANCH to HEAD).

answered 2011-06-09T11:52:24.240