CVS conflicts and GUI forms?

In our company we are considering using the GUI designer of IntelliJ 4.5 but we are wondering about one thing. We use CVS and we are a bit worried about what will happen if two people work on the same GUI at the same time (even if only a small modification) and this results in a cvs conflict in the .form file. How will IntelliJ handle this? Normally with cvs conflicts one is supposed to manually resolve the conflict by editing the file but how is this supposed to work here?

Greetings and thanks in advance,

1 comment
Comment actions Permalink

Ok, we just tried this out and the results are not pretty... Seems that the form becomes invalid (i.e. cvs puts conflict markers in it) and it is impossible to correct this in IntelliJ. One has to go and edit the form file manually (which is a bit hard).



Please sign in to leave a comment.