cvs merge

- in IDEA 4.5.3 there is no Undo in the merge window.
when you accidentally click on "ignore change" you have to start again.

- is it possible to integrate a merge tool?
maybe it is just my screen resolution (1024x), but for
sometimes it is not easy to match the changes, because
it is required to scroll one of the 3 views very far
down. Araxis Merge is better in that respect...

- I tried with Irida, but it immediately threw an
exception when CVS->Merge

Please sign in to leave a comment.