I'm having major problems with git merge conflicts between my production vpm and my local machine, mainly with sqlite3.
I fix any bugs / add new features on my local machine and then
git add .
git commit -m "message"
git push -u origin development
Then merge the master and development branch on GH.
My production vpm always has an updated version of the sqlite3 database (obviously as users are registering etc) which I don't have on my local machine.
Every time I git pull
to my production machine, I get a merge conflict with the sqlite3
db.
I've accidentally overidden the production database with the one from my local machine and wiped accounts and then had to git reset.
It's unclear to me whether I should make a .gitignore, I ran git rm db.sqlite
but then it was removed from my local machine totally which I obviously don't want.
I basically want the production machine to always be the database that is used regardless of any changes to the database locally when I git pull
.