application: bear-status
version: 1
runtime: python27
api_version: 1
threadsafe: yes

handlers:
- url: /favicon\.ico
  static_files: favicon.ico
  upload: favicon\.ico

# static urls
- url: /view/stylesheets/
  static_dir: view/stylesheets
- url: /view/javascript/
  static_dir: view/javascript

# set up the edit page to require admin access
- url: /date.*
  script: edit.app
  login: admin

- url: /edit.*
  script: edit.app
  login: admin

- url: /changelunch.*
  script: edit.app
  login: admin

- url: /revertdate.*
  script: edit.app
  login: admin

- url: /splitlunch.*
  script: main.app

- url: /specificday.*
  script: main.app

- url: .*
  script: main.app

libraries:
- name: webapp2
  version: "2.5.2"
- name: jinja2
  version: latest
- name: yaml
  version: latest

inbound_services:
- warmup

application: bear-status
version: stable
runtime: python27
api_version: 1
threadsafe: yes

handlers:
- url: /favicon\.ico
  static_files: favicon.ico
  upload: favicon\.ico

# static urls
- url: /view/stylesheets/
  static_dir: view/stylesheets
- url: /view/javascript/
  static_dir: view/javascript

# set up the edit page to require admin access
- url: /date.*
  script: edit.app
  login: admin

- url: /edit.*
  script: edit.app
  login: admin

- url: /changelunch.*
  script: edit.app
  login: admin

- url: /revertdate.*
  script: edit.app
  login: admin

- url: /splitlunch.*
  script: main.app

- url: /specificday.*
  script: main.app

- url: .*
  script: main.app

libraries:
- name: webapp2
  version: "2.5.2"
- name: jinja2
  version: latest
- name: yaml
  version: latest

inbound_services:
- warmup

Split the code into two branches: “master” (stable) and “development (unstable). New code additions should go in the development branch until they have been tested, then they can be merged into the master branch.
Split the code into two branches: “master” (stable) and “development (unstable). New code additions should go in the development branch until they have been tested, then they can be merged into the master branch.

To switch branches using SourceTree:

In the left sidebar: under REMOTES / origin, double click on “development” (gray icon). You then will be able to add the development branch as a local branch that you can work on. This sets up the two branches so you can switch back and forth between them.

To switch between branches, double click on the appropriate branch under BRANCHES in the sidebar (blue icons)

Important: when pushing changes, be sure to make sure you are pushing to the branch you want
