Hi guys,

I'm having issues managing my post-launch workflow. For example one of my clients wants to be able to make content edits which I have made accessible by making heavy use of content files and using the editable plugin. However whenever I make changes from my local version these are going to overwrite the changes that the client has made.

I currently have a local environment locked in git and when I make a change I commit them then push live to a bare repo on my production environment. in essence all I want is for git to ignore the /content directory however adding in the content directory to a .gitignore and remove the original content files from git cache deletes all the content whenever I push new changes up.

I've read through the previous threads however it doesn't seem someone has been able to come up with an optimal solution.

Kind regards

So after experimenting I have a solution that is not perfect but is working.

What I currently do is use git to deploy websites from my development environment to my production environment. If the client has access to the website and the development and staging/live versions become unsync'd what I do is first grab the pages/content folders or anything that the client has access to and place them in a new branch created in the development version.

Once that is done I merge the new branch into the master branch and push it to live/staging remotes

This might do the trick - http://stackoverflow.com/a/11895774