I am fairly new to IDEA and SVN and had some questions. But first, some background. I inherited a subversion project (Someone handed me a backup of a project in a jump drive and I opened it up in IDEA).
My questions are:
In the project window, If I right click on the project name I see "Synchronize 'The project name'." What does this do? Will it pull everything from the svn repository and overwrite (i.e., throw away my changes) my files or will it merge changes into my files indicating to me that these file have been merged?
What will right click on project directory->Subversion->Update Directory... do? Will it get things that are newer in the repository and merge them with my files indicating to me that some files have been merged?
Basically, what I am trying to figure out is 1) how do get the latest trunk from svn and in the process overwrite whatever I have changed locally? (that is, throw away whatever changes I have made locally) and 2) how do I get what is new from svn and have IDEA merge this with what I have so that after I oversee the merged files, I can check them in?