Main development environment is local laptop
Master reponsitory on Unfuddle.com
Live environment on remote server
There are a few files, like settings.py, that I don't want to be synced and as these files were already in the repository I'd created, git kept trying to sync them.
To resolve:
Assuming already have everything setup - remote server setup with clone from unfuddle.
Create .gitignore file as part of repository:
settings.pyRemove settings.py from git without deleting on both local and remote environments.
*.pyc
*~
site_media/avatars/*
In Local environment:
git rm --cached settings.pyIn remote live environment
git commit -a -m "remove settings.py"
git push unfuddle master
git rm --cached settings.py
git commit -a -m "remove settings.py"
git push
That should do it. Now commits can be exchanged without settings.py being updated.
No comments:
Post a Comment