DevOps Stack Exchange is a question and answer site for software engineers working on automated testing, continuous delivery, service integration and monitoring, and building SDLC infrastructure. It only takes a minute to sign up.
Sign up to join this community
I have a dev site on a server which is synced with my git repo. The git repo does not track the media/ folder.
I want to update the content on the dev server to mirror the live server, so will copy over the database and the media/ folder from live to dev.
My worry is when I do this, git will pick up the changes in the filesystem with the new media/ files and won't allow me to do a git pull.
What's the best practice to handle this?
Git doesn't consider the untracked files for making decisions about accepting or rejecting a git pull operation, so you should have no worry about it.
If still in doubt you can easily verify it: just pull another copy of the same git repo in some other location - for test only - mess with untracked files in it and pull again.
You can add /media to .gitignore
