Merge local, non-git, source to git source and create a gitignore