insert setting.py in ignore list. update setting-tmp.py if it is major change we need to know. then diff it with your setting.py and update manually