To start off, when you say "copied it to the main site", what exactly do you mean? Do you have 2 working copies of the initial release - one in /home/usr/www/ and one in someplace more normal for web files like /var/data/something? And 'push directly to the new site' - from where to where exactly? When I deploy web sites, I always push from my dev environment to github, then on my production box, pull the changes from github. It is easiest to do this when you have not made changes on your production checkout (then all the merges should be simple fast-forwards). Since you have made some live updates, I would suggest you commit those to your local repository now. Then, to check what changes will come in from the developers, do a 'git fetch' to bring the updates down from github but NOT merge them into your working copy. Once the repo knows about the remote changes, you can look at the differences. You can either use 'git diff' with appropriate arguments. Or, you might want to look at the changes using gitk. I find seeing the change list laid out in a graphical manner can be very helpful. If the changes are acceptable, you can do a git merge. Then you can do a 'git push' to put your changes on github for your developers to pull into their repositories (either with step by step fetch + merge or all in one command with git pull).
On Fri, May 8, 2009 at 3:38 PM, bin.asc <[email protected]> wrote: > > Ok, long story short. > A new website is being built, and the crew that is developing it are > using git and github for versioning and storage. > They released a first release of the site that was pushed on /home/ > user/www. > I took that, copied it to the main site, and for the past 4-5 days > been changing wrong links and so on. Meanwhile they were doing changes > on their dev version, adding more features and so on. > The problem that I`m facing is that I want to configure git to push > changes directly to the new site. > The issue is that I already have done some changes to the files from > their initial release, and would like to know if there is a change to > merge their version with my version, so I can retain my settings but > also update their master branch. Any help is appreciated. > > > > -- Cynthia Kiser [email protected] --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
