Here is one approach. I think what you may want to do is to clone a copy of the devs git repo.
Then checkout a branch on that repo, but the branch should be based on the same commit that you deployed to the production site before you made your changes. Now that you have the base of your live site checked out in the git repo, just copy manually each of the files you changed on the live site dir over the files in the working branch in your repo. When you finish you should be able to do a 'git diff' and see all of the changes you made. When you are satisfied, do a 'git add .' followed by a git commit. So now you topic branch represents your copy, and the master branch represents the devs latest work. Then merge the changes in master on top of your topic branch. You'll likely need to make changes to get the merge done to your satisfaction. Ultimately your topic branch should represent all of your live site changes + the most current dev work. Last step would be to merge your topic branch back on top of master and have your devs pull this code as the new base to work from. In the future you should look at using a git clone to represent your live site. You could even have a 'production' branch which represents the production code that you want to be live. Then all you have to do is a git pull on your production clone and you'll always have the latest code on the live site. If you wanted to rollback simply checkout a previous commit. Hope that gives you some guidance. Glenn On May 12, 2:55 pm, "bin.asc" <[email protected]> wrote: > Basically, I have the prod version in a /home/prod/public_html folder > that`s getting pulled from the main github repo. > When our devs pulled the first version, I just copied the files to / > home/live/public_html which is the live site and since then the devs > pulled some updates in /home/prod/public_html/. > I have to mention that I have access to their dev,prod and qa repos. I > just need a way to get the changes they did in the live site without > having to redo all the changes, as they are ALOT. What I`m looking it > to basiaclly merge the live with the prod, and then have git pull > directly on our live. > I hope it makes some sense :) --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/github?hl=en -~----------~----~----~----~------~----~------~--~---
