How to do svn 1.5 style merges? 关注
starting in svn 1.5 a simpler merging mechanism was introduced in subversion. Does anyone know if there is a way to do such merges currently in IDEA. If not is there any intention of this being supported at some point?
I think I found it... it's under "merge from" which can be found in the changes tool in the "Subversion working copies information". That a very strange place to put it!