1

I started using sourceTree I have a problem when I change certain files, I noticed those are files from my views folder (MVC), sourceTree marks it as:

Modified file, 1 lines changed, 1 lines removed

and when I push it to my svn the whole file is marked as changed, as in: All the code from before my changes marked with '-' And then all the code from after my changes marked with '+' (also stuff I didnt touch)

Any solutions?

tereško
  • 58,060
  • 25
  • 98
  • 150
Asaf Maoz
  • 675
  • 3
  • 6
  • 23

1 Answers1

2

Make sure that the config core.autocrlf is set to false, to avoid automatic eol (end of lines) conversion on all your files.

git config --global core.autocrlf false

(and re-clone your repo to see if the issue persists)

See for more "SourceTree App says uncommitted changes even for newly-cloned repository - what could be wrong?"

This sourceTree thread points out also to .gitattributes files.

The OP Asaf Maoz points to another source (in the comments), still related to eol:

the problem was in my IDE line endings settings, some files line endings was set to MAC (when I am not on MAC) and ST could not convert them properly.

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • @AsafMaoz I wasn't talking about the *local* config, but about the global one (and then re-clone again, to see if the issue persists). – VonC May 07 '14 at 15:36
  • Didn't help changing the config autocrlf, the problem was in my IDE line endings settings, some files line endings was set to MAC (when i'n not on MAC) and ST could not convert them properly. – Asaf Maoz May 12 '14 at 09:20
  • @AsafMaoz Ok, I have included your conclusion in the answer for more visibility. – VonC May 12 '14 at 09:22