I have created a branch from my trunk and then made som changes to the branch (mostly added new classes and code). Now there is changes to the trunk daily. Now I want to update from trunk to branch on a daily basis so that they do not divergate to much from each other. I want the diffrence between the two just to be the changes I have checked in on the branch. I have tried "Integerate directory" but it seams to remvoed the changes I ahve done to the branch in addition to retriving the changes from trunk.
Basically I want to do this: http://www.infoq.com/news/2008/04/kniberg-agile-version-control
How do I do this from inside IntelliJ 8.