Settings file getting overwritten in Eclipse

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
debug/
# Project Settings and MetaData
.project
.settings/
.metadata
build.properties
config

# Apex Log as optional
apex-scripts/log

# Eclipse specific 
salesforce.schema
Referenced Packages
bin/
tmp/
config/
*.tmp
*.bak 
local.properties
.settings
.loadpath
.classpath
*.cache

# Illuminated Cloud (IntelliJ IDEA)
IlluminatedCloud
out
.idea
*.iml

# Mavensmate
*.sublime-project
*.sublime-settings
*.sublime-workspace
mm.log

# Haoide SublimeText
.config
.deploy
.history

# OSX-specific exclusions
.[dD][sS]_[sS]tore

# The Welkin Suite specific
**/.localHistory

*.sfuo

TestCache.xml

TestsResultsCache.xml

Open in new window


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?

Thanks.
-Dman100-Software ConsultantAsked:
Who is Participating?

[Product update] Infrastructure Analysis Tool is now available with Business Accounts.Learn More

x
I wear a lot of hats...

"The solutions and answers provided on Experts Exchange have been extremely helpful to me over the last few years. I wear a lot of hats - Developer, Database Administrator, Help Desk, etc., so I know a lot of things but not a lot about one thing. Experts Exchange gives me answers from people who do know a lot about one thing, in a easy to use platform." -Todd S.

Martin MillerCTOCommented:
Generally, I don't endorse promoting your configuration of local toolset into a repository.

Are you sharing this repository with anyone else?
0
-Dman100-Software ConsultantAuthor Commented:
there are multiple feature branches of the master branch. The original master repo was not created by me. I only created my own branch and I'm encountering this issue every time I do a fetch from master. What is the correct solution? Should I recommend that the .settings/ folder be removed completely from the master branch?

I just assumed that if the .gitignore file excluded the .settings/ folder it wouldn't bring that down during a fetch or would overwrite during a merge? I'm pretty new to version control so I apologize if I'm asking basic questions. Just trying to understand and get a good grasp on the proper workflow process.
0
Martin MillerCTOCommented:
Unless everyone shares the same local Eclipse setting, yes remove your personal setting, from the master branch.

Good luck with your development!
0

Experts Exchange Solution brought to you by

Your issues matter to us.

Facing a tech roadblock? Get the help and guidance you need from experienced professionals who care. Ask your question anytime, anywhere, with no hassle.

Start your 7-day free trial
It's more than this solution.Get answers and train to solve all your tech problems - anytime, anywhere.Try it for free Edge Out The Competitionfor your dream job with proven skills and certifications.Get started today Stand Outas the employee with proven skills.Start learning today for free Move Your Career Forwardwith certification training in the latest technologies.Start your trial today
Eclipse

From novice to tech pro — start learning today.