Best practice for managing project variants in Git?

Question

I have to develop two Django projects which share 90% of the same code, but have some variations in several applications, templates and within the model itself.

I\'m

Answer 1

Considering it is a Django / Pinax site, with variants scattered around inside several different applications, I would not recommend using submodules.

The variants should be managed independently in project1 branch and project2 branch, removing the need to "filter" a gitignore result.

If you identify some really common codes, they may end up in a third repo you could then "subtree merged" to project1 and project2 repositories (the meaning of subtree merge strategy being illustrated in this SO answer)