Question

Until now I used svn as source control. At this time I have started a new project and it is stored on gitHub.

Issue is that Heroku and GitHub, both use git. First one to publish app and second one for version control.

My app schema is:

base-dir                                    <--github base
    some-text-files (Readme, ... )
    django-project-dir                      <--heroku base
        manage.py
        main-app-dir
           settings.py
        other-app-dirs
           views.py
           models.py

When I push to gitHub base-dir and all subfolders are pushed.

To Heroku only django-project-dir should be pushed.

Notice: I have tried to create a new git repository at django-project-dir level but git take it as a submodule and excluded from gitHub.

Because this is a new project I can easily change to another schema dirs.

My question:

What is the easy way to coexist both Heroku and GitHub git configurations?

Answer 1

Your best bet is to move you readme and other files to your project root. Then just add GitHub as a separate remote (when you’re in your project directory).

git remote add origin https://github.com/USERNAME/REPO

Then you can push to GitHub with git push origin master. You will have to do a forced push (the -f option) the first time assuming you’re pushing what used to be the repo you used exclusively for Heroku.

You’ll still be able to push to Heroku with git push heroku master.