1) We have an existing application running with an unpacked gem
2) The application has some customisations to the unpacked gem
3) I would like to somehow "merge" a new version of said gem into this unpacked gem to bring it up to date.

Any ideas on a nice way of doing this?

All the code is in git, although the gem source is in a different repo.