Commit your changes or stash them before you can merge??!?!

When trying to update your local copy from remote master copy, you will see following error

$ git pull origin master
error: Your local changes to the following files would be overwritten by merge:
<list of files>
Please commit your changes or stash them before you merge.
Aborting


You have several options here

1. Commit the change
$ git add .
$ git commit -m "committing before the update"


2. Stash them
$ git stash
$ git stash pop

3. Overwrite local changes
git reset --hard

Add Twistd to your Flask app

I'm using twisted web as front end for flask wsgi app. you probably already know of it. if not, it's essential. non-blocking IO. fully scales up.

1000's of connections

essentially, twisted combines the non-blocking IO of tornado and front end container of gunicorn in one package

$ pip install twisted

$ vi run.sh
export PYTHONPATH=.:$PYTHONPATH
twistd -n web --port tcp:8006 --wsgi yourfile.app
<where .app is the flask app inside yourfile.py>

$ nohup ./run.sh &