However, I had my cow orker try it another day, and we've failed to find a way to visually synchronize project with repository, like you do in Eclipse. Therefore, threw it out.
However, I had my cow orker try it another day, and we've failed to find a way to visually synchronize project with repository, like you do in Eclipse. Therefore, threw it out.
And no, it's not just what people are used to. Earlier this year, me and another guy converted a few developers from Eclipse to IDEA and they were all really happy about discovering it.
I want to see which changes are due, and which changes are to be imported. Like one does in eclipse under Team -> Synchronize with repository.
I fail to find such a mode in IDEA.
Noone is yet to point me to it.
You have a three-column view with the local version on the left, the merge in the middle, and the changes on the server on the right.
Then you can pick and choose which changes to include and which ones to revert, and their locations are all marked with red and green colors on the sides (of the columns).
I assume that's what you meant, and I don't remember ever having to "opt in" for that functionality.
Btw, it's possible that the people on #java were all using Eclipse :)
I'm not asking for a visual merge "when there are conflicts". I'm asking for a visual merge NOW; because I said so. Because if it fails to produce the said visual merge, it gets thrown off the window - exactly what's happened.
And it's more than visual merge; I also want a tree of files that have been changed, on both sides; and I want to look at diffs when clicking on them; and to choose what to update, what to commit. It's very much more than just a dumb commit all/update.
Nope, those people on ##java are really passionate about IDEA.
You can choose specific files to commit or update in IDEA too, but I guess that's no good either if it doesn't happen exactly where you want it to.
Why do you want a visual merge even when there are no conflicts though? You could just edit out everything that shouldn't be committed, and then commit.
Having said that, I'm way less disciplined than I used to be, so I've gotten so I just trust the merge. The mentors who taught me the ropes with version control systems would not be impressed.
Or maybe they've also realized it's not 1992 anymore.
If you're just developing a web application or twitter client, it's probably not worth being so anal-retentive about it.
If it really works (didn't check) then IDEA would be fine. Still I'd prefer these modes to be merged.
and if it doesn't do what you want, I suggest writing a feature request. I have gotten quite a few features this way.