I'm having a local project and I want to use a git repository as versioning software.
As I'm using an external software on a SVN server as base for my project I think the best way is to have it as a vendor branch in my git project so external changes don't affect my code and I can merge the vendor branch in the main trunk from time to time.
Is it possible to mix git and SVN like this? What is the best project layout and how do I actually merge the vendor branch in the main trunk?
I now did it like this: