Keep it simple. All other ignores should either go in .git/info/excludes or global ignore list. See https://github.com/github/gitignore for more info and examples.
Garbage OS files from initial commit
Merge remote-tracking branch 'refs/remotes/origin/Cosmetic' into dev
Merge remote-tracking branch 'refs/remotes/origin/Trash' into dev

ludes or global ignore list. See https://github.com/github/gitignore for more info and examples.