-Dman100-
asked on
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:
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.
# 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
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.
ASKER
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.
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.
ASKER CERTIFIED SOLUTION
membership
This solution is only available to members.
To access this solution, you must be a member of Experts Exchange.
Are you sharing this repository with anyone else?