I was told that I should use Changes | Local and Changes | Incoming in IDEA. If ...

		ilyak on Oct 16, 2009 \| parent \| context \| favorite \| on: IntelliJ IDEA goes open source I was told that I should use Changes \| Local and Changes \| Incoming in IDEA. If it really works (didn't check) then IDEA would be fine. Still I'd prefer these modes to be merged.