Can't discard changes about desktop

[SeanOBrien2702]

I have tried on another machine with the same issue. I also tested other repositories and I am not having any problems.

[steveward]

Thanks for the issue @SeanOBrien2702. I'm seeing this in the log file, which aligns with what you're saying:

2024-06-14T21:24:08.350Z - error: [ui] `git -c credential.helper= checkout --progress main --recurse-submodules --` exited with an unexpected code: 1.
stderr:
error: Your local changes to the following files would be overwritten by checkout:
	Assets/Hisa Cube Animal/Sprites/Sprites 1.0 & 1.1/Catz_Rabbit_2.png
Please commit your changes or stash them before you switch branches.
Aborting

(The error was parsed as 38: Unable to switch branches as there are working directory changes which would be overwritten. Please commit or stash your changes.)

Is there any other application that has these files open?

If you want to try forcing a discard from the command line you can run git checkout -- <path/to/file>. If you want to force a discard for **all** files you can run git reset --hard HEAD`. Let me know if either of those commands causes the same issue you are experiencing in Desktop.

[SeanOBrien2702]

The fixed the issues. I believe the issue was something related to end line differences. I changed my .gitattributes file according to the recommendations in the Handle Line Endings "Get Started" page. I had to reimport the files into the project but I am no longer running into the issue.