Diff shows contents identical - yet file is marked blue in the compare, making it challenging

已回答

I can share a screen shot if need be, but when comparing in SVN a branch to trunk, it's showing that some files are different, yet in the diff screen it shows them identical. I get that they might show up as identical based on the ignore setup but the initial compare doesn't seem to obey that. I don't want to have to click through a bunch of files only to see they are identical. 

0

Please share additional screenshots of an issue.
Also how and when do you open diff? Are you checking it before a commit or right after an update of a project?

0
Avatar
Permanently deleted user

I'm checking it after both trunk and the branch have been updated. 

So here is a screen shot of an example. It's showing DailyPurchaseExtractProcessor as "blue" as in there is change , yet when I right click "show diff" it says "contents are identical"

0

Any update on this?

0

This looks similar to the existing issue IJPL-227506, could it also be related to CR/LF line endings difference?

0

Probably. The issue is also exist with images:

There is no option at the bottom of the Rider to change line ending for images. Also Rollback on these problematic files does nothing. What is pretty annoying and often breaks rebase.


Is there any way to make rider ignore line endings?

0

Made a screen recording how it looks: Upload id: 2026_01_28_25dJyT7NzosWEZ6jQ63dGZ (file: Screen Recording 2026-01-28 at 10.50.03.mov)

0

The only way I found to bypass this lock is to use git hard reset.

0

On your screencast, it looks like you use shelve/unshelve. Is that correct? If yes, this looks similar to IJPL-73203

0

No, it's not related in this case. Those files are not from shelf.

0

aliakseikartashou This could be a difference in Git config.

IDE relies on the git cli to perform diff and status commands. So if it shows that contents are identical, it gets this information from the git diff command.

Which git installation the IDE uses (Settings | Version Control | Git | Path to Git executable) and which git installation you use in the command line/terminal?

0

请先登录再写评论。