#SOURCETREE DISCARD UNCOMMITTED CHANGES MAC#

#SOURCETREE DISCARD UNCOMMITTED CHANGES MAC#

On Linux, this is actually now two separate directories: /foo/bar/fileAĬhecking this repo out on Windows or Mac may result in modified fileA that cannot be reset, because on each reset, git on Windows checks out /foo/bar/fileA, and then because Windows is case insensitive, overwrites the content of fileA with /foo/Bar/fileA, resulting in them being 'modified'.Īnother case may be an individual file(s) that exists in the repo, which when checked out on a case insensitive filesystem, would overlap. Now someone on Linux commits files into /foo/Bar (probably due to a build tool or something that created that directory) and pushes. For example, say a path like the following exists in the repository: The second possible cause is case insensitivity on Windows or Mac OS/X. Note that, unless you do normalize the line endings in the repository at some point, you will keep running into this issue. If you really want to try and revert the changes to the file manually then the easiest solution seems to be to erase the modified files, and then to tell git to restore them, although I note this solution does not seem to work consistently 100% of the time ( WARNING: DO NOT run this if your modified files have changes other than line endings!!): git status -porcelain | grep '^ M' | cut -c4- | xargs rm gitattributes, and committing those changes - see Trying to fix line-endings with git filter-branch, but having no luck. The best option is to let git apply the normalization it wants to by normalizing all the line endings in the repo to match the. Every time the file is 'seen' by git, it will try and reapply the normalization, resulting in the same issue. Workarounds in which the local line endings are reset will not solve the problem. Unfortunately, for some reason git reset -hard does not undo these line normalization changes. gitattributes or global config, Git has applied local changes to your working copy that apply the line ending normalization requested.

gitattributes or modified the tocrlf setting to normalize line endings (2).

To confirm, verify that git diff shows only changes in line endings (these may not be visible by default, try git diff | cat -v to see carriage returns as literal ^M characters). One situation in which this can happen is when the file in question was checked into the repository without the correct configuration for line endings (1) resulting in a file in the repository with either the incorrect line endings, or mixed line endings. Possible Cause #1 - Line Ending Normalization

Sourcetree discard uncommitted changes