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.
--~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
