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

You can use two different git branches for development. When you make changes in one that are common to the other, just git-cherrypick them over. You can push and pull specific branches, too, so that no one ever need know you're working on both of them at the same time.