Skip to content

Commit

Permalink
added description how to update from skeleton
Browse files Browse the repository at this point in the history
  • Loading branch information
Nikolaus Graf committed Nov 24, 2010
1 parent 2f12a24 commit 6aaa284
Showing 1 changed file with 20 additions and 5 deletions.
25 changes: 20 additions & 5 deletions readme.md
Expand Up @@ -47,24 +47,39 @@ here is a list of assembled components

# Setup

* clone repository
clone repository

git clone git@github.com:deck/flask-gae-skeleton.git <project_name>

* fetch all the submodules via:
fetch all the submodules via

git submodule update --init

* set your own appengine application id in app.yaml
* change the 'secret_key' in settings.py
set your own appengine application id in app.yaml

* add replace remote
change the 'secret_key' in settings.py

add replace remote

git remote rm origin
git remote add origin <new_remote like git@github.com:your_name/project_name.git>
git commit -am "initial setup"
git push origin master

# Update from Skeleton

Add the remote and merge in all changes and removes the old stuff again.

git remote add skeleton git@github.com:deck/flask-gae-skeleton.git
git pull skeleton
git checkout -b skeleton remotes/skeleton/master
git rebase <your_development_branch like master>
git checkout <your_development_branch like master>
git merge --no-ff skeleton
git branch -D skeleton
git remote rm skeleton
git submodule update

# Usage

## Run Application
Expand Down

0 comments on commit 6aaa284

Please sign in to comment.