Skip to main content
Software Engineering

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

Required fields*

5
  • This still allows updates to be made that turn out to create conflicts when pushed to Git. If possible, I'd prefer to reverse things: everybody has to write to Git (and can't push until conflicts are resolved) and the web server uses data pulled from git. Commented Dec 8, 2016 at 18:58
  • 1
    You need to break yourself and your clients of the (bad) habit of making changes on a production server. Once you do that, it's relatively easy to auto-deploy from Git onto that server. Commented Dec 8, 2016 at 20:23
  • So the problem is with content maintainers, and several trusted business customers. Do they have access to the Git? Do they know how to use it? Another question is. What kind of static content do they change/upload that It's not (may be it should not be) in the Git? CMS exists for a well reason Commented Dec 8, 2016 at 21:05
  • @Laiv You are correct, that is the problem. The maintainers have access to Git, and could be trained to use it, the business customers would not have access or know how to use it, or want to be trained. When they make changes it's to static html, or file uploads such as pdf/xls/docx/etc. Commented Dec 8, 2016 at 21:24
  • 1
    You could redirect ftp account to another folder. An specific workspace for example. The workspace be pointing to a specific branch of the Git. Then via servicies execute periodic pushes to the Git. Finally, an authorized user may perform the merge request into the "right branch" and build up the deployable ( a copy of the content into the webroot). All this magic is possible with CI tools too Commented Dec 8, 2016 at 21:31