my suggestion..

1- create a new branch from master branch.
2- get the project from the server  and put it inside the new branch
3 - execute 'git diff' between your new branch and master branch to see the
changes were done
4- choose the code you want to use...
5- execute 'git checkout master' to jump to master branch and then execute
'git merge new_branch'

hope this helps you

On Tue, Jun 16, 2009 at 3:43 PM, dgware <dgw...@gmail.com> wrote:

>
> My developer started a project and used git as the repository. Then I
> got another developer who didn't use git and made the changes directly
> on the server.
>
> Now I have a new developer who is going to use git, however since the
> last developer didn't use git, how do I update the git so that it
> includes the changes to the code that was done my the developer who
> did not use git.
>
> thanks for the help
> >
>

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to