Skip to content
This repository has been archived by the owner on Jul 26, 2020. It is now read-only.

Ignore user .DS_Stores #18

Merged
merged 1 commit into from Dec 23, 2015
Merged

Conversation

Jxrgxn
Copy link

@Jxrgxn Jxrgxn commented Dec 22, 2015

First removed .DS_Store from Git tracking. Then added .DS_Store to .gitignore.

The file has nothing to do with the code that is being tracked in git. It contains custom attributes set on the containing folder in the Finder. Unless those custom attributes are relevant to the code, that file is just noise. Additionally, if the file is not ignored and gets checked in unintentionally and later two devs each decide to put say, pretty custom icons on the folder (for whatever reason), then you could end up with a merge conflict on a binary file.

@stsievert
Copy link
Owner

Thanks! Merged.

stsievert pushed a commit that referenced this pull request Dec 23, 2015
@stsievert stsievert merged commit 0a8cd32 into stsievert:master Dec 23, 2015
@stsievert
Copy link
Owner

I don't see any .DS_Store's in the repo already -- this didn't remove those, correct?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants