Win a copy of Programmer's Guide to Java SE 8 Oracle Certified Associate (OCA) this week in the OCAJP forum!
  • Post Reply
  • Bookmark Topic Watch Topic
  • New Topic

SVN merge with IntelliJ IDEA

 
surlac surlacovich
Ranch Hand
Posts: 296
Spring
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
I have IntelliJ IDEA 12.1.3 installed and I have trunk and branch in SVN.
I use IDEA to merge from branch to trunk, and call command Subversion->Integrate Directory.
Source 1 is branch, Source 2 is trunk, unticked "Use ancestry", depth "infinity".
The problem is: it marks files without changes as modified (an shows no differences in "Show Diff").
How would I solve that?
 
surlac surlacovich
Ranch Hand
Posts: 296
Spring
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
Or maybe it is SVN specific problem?
 
  • Post Reply
  • Bookmark Topic Watch Topic
  • New Topic