Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix annoying false or useless changes in github desktop #1265

Merged
merged 19 commits into from
Oct 7, 2023

Conversation

stilnat
Copy link
Contributor

@stilnat stilnat commented Sep 21, 2023

Summary

Solve those damn false change, at least should. Needs some testing and messing around to check if new files are an issue.
If new files appear, a solution might be to commit them directly through git, using git add and git commit, as github desktop think there's no changes (but still display them...). Simply commiting should solve the issue thanks to the .gitattributes.

Some files have been added to .gitignore too, that should help.

Fixes (optional)

Closes #1262

@stilnat stilnat changed the title [WIP] Fix line end of files and remove annoying changes in github desktop Fix annoying false or useless changes in github desktop Sep 21, 2023
@singulocity
Copy link
Contributor

image
Still getting 3. Looks like it is trying to remove them.

@stilnat
Copy link
Contributor Author

stilnat commented Sep 26, 2023

@singulocity thanks for the feedback, should be good for defaultPrefabObject but can't get the two others to appear, do you remember doing anything particular to generate the change ?

Copy link
Member

@cosmiccoincidence cosmiccoincidence left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hard to tell if this fixed everything or not. But merging for now and we can see if anything survives.

@cosmiccoincidence cosmiccoincidence merged commit d3a4a09 into RE-SS3D:develop Oct 7, 2023
2 checks passed
@stilnat stilnat deleted the fix-line-end-of-files branch November 9, 2023 23:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Inconsistent line endings in files
3 participants