[gregwhitworth]

Here is how my current setup is:



So here is how my process looks:

Quote

Local machine:
Create and make major edits.
Commit changes and push them to the repo

Staging Server:
Clone repo
Update config files to work on the staging server

My issue that I am having is upon doing a fetch it overwrites all of my local files. I don't want to have to reset my config file everytime I do a fetch. This is what I want to do:

Quote

Local Machine:
Make edit to file X.php
Add file X.php
Commit file X.php
Push commit

Staging Machine:
Fetch just file X.php, or ALL changes except config/*

I do have a .gitignore but that should keep me from adding them, and by default I have a config sample file in there so that I don't have to manually upload and place the file.

Hopefully this makes sense. Let me know.