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
# Project Settings and MetaData

# Apex Log as optional

# Eclipse specific 
Referenced Packages

# Illuminated Cloud (IntelliJ IDEA)

# Mavensmate

# Haoide SublimeText

# OSX-specific exclusions

# The Welkin Suite specific




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?

-Dman100-Software ConsultantAsked:
Who is Participating?
Martin MillerCTOCommented:
Unless everyone shares the same local Eclipse setting, yes remove your personal setting, from the master branch.

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

Are you sharing this repository with anyone else?
-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.
Question has a verified solution.

Are you are experiencing a similar issue? Get a personalized answer when you ask a related question.

Have a better answer? Share it in a comment.

All Courses

From novice to tech pro — start learning today.