Merging in changes from outside a git repository

Question

I'm working with another developer on the other side of the country who is the lead on our project, and isn't using a formal version control system. On my end, I'm tracking all of my code in git. I've recently started contributing to the main project, and would like to be able to track updates from the other developer as well.

When I receive his updated code, it's usually in the form of a zip file. If I simply unzip the file into my git working folder, git believes that every file has changed, presumably because the stat info has changed.

What I'd like to see is a way that I can unzip the new code alongside my working copy, and merge in only the changes. What's the best way to do this? As it's a Powerbuilder project, most of the files are binaries.

Thanks!

Answer 1

Check out if contrib/fast-import/import-zips.py would do what you want.

Answer 2

this, altho not entirely sure a good idea, is what i'm thinking of doing in almost the same situation:

what about basically maintaining a repo for them?

any changes you receive get placed in their repo and committed. then merge their repo, which would be a tracked remote, into yours when you need to?