4 comments
Comment actions Permalink

Well, you can merge branches in Aurora already. Just do an update and select the branch you want to merge in the update project dialog.

0
Comment actions Permalink

Thats true, but you can't merge conflicts between branches...

0
Comment actions Permalink

After merging, all files with conflicts will be marked so. Then you can use IDEA's superb merge tool to solve the conflicts on each file.

0
Comment actions Permalink

Yes you can invoke the three way merge tool after an update on each file with a conflict, but this only works with conflicts within the same branch.

I think the problem is that when you merge delta changes from one branch to another the merge tool gets really confused.

This is reported as an unsupported feature for 4.0 and I hope they solve it for 4.x

See http://www.intellij.net/forums/thread.jsp?forum=33&thread=78822&tstart=0&trange=15 for more info about the branching..

Personally i hope they include support for subversion in the near future :)

0

Please sign in to leave a comment.