All geek questions in one place

Intellij idea - comparison between branches - content is identical

I have weird behavior in IDEA. While I am comparing two different branches (one loaded in local and one in repo mode), I get a list of files with "differences".

The fact is that when I double-click on a file, it shows that the files are identical and the message Contents are identical

Is this really so? Is something cached in Idea? Or is this bad SVN behavior?

+5
source share
3 answers

not only content, but also mode or other metadata may also be different, try

 git diff
+1
source

I was worried about the same problem, I just wanted to unite, not worrying about non-content changes.

I found out that (in IDEA 2016.2) you can compare differences between projects (folders) instead of version differences. It even provides a good graphical overview of additions and abstractions based on content rather than data versions.

  • Check both branches
  • Open the branch you want to join with in IDEA
  • Select the base folder you want to merge (possibly the entire project folder) and press ctrl + D (Compare with ...)

Now you get a much more complete window with all the changes and filtering options. You can even decide how to compare intelliJ (content, date, ...)

+1
source

Contents are identical displayed when the only difference concerns the line separator. Check if the same is used in both files (LF, CRLF or CR).

0
source

Source: https://habr.com/ru/post/1211616/

More articles:


All Articles