Every time I do a remote fetch from origin master down to my local master and then merge into my local branch, my preferences file gets overwritten. In my .getignore file the .settings/ folder is excluded:
# GitIgnore for Salesforce Projects
#ignore debug folder
# Project Settings and MetaData
# Apex Log as optional
# Eclipse specific
# Illuminated Cloud (IntelliJ IDEA)
# Haoide SublimeText
# OSX-specific exclusions
# The Welkin Suite specific
In my remote feature branch and remote master branch, the .gitignore file is identical and has the .settings/ folder excluded. I cannot figure out why my settings file keeps getting overwritten every time I do a remote fetch and then merge into my local branch.
How can I prevent my preferences file from getting overwritten every time I do a remote fetch from master?