The official Insoshi repository at GitHub includes the branches:

• master
  Stable version of Insoshi. Updated on a set schedule with fixes and features that have passed unit and integration testing.
• edge
  In-progress version of Insoshi. Features and fixes in the pipeline for release are added once they're completed. Everything should work (but you might run into an issue here and there)

Additional branches may temporarily be created in order to handle specific development efforts.

If you haven't pulled in updates from the official repository, you may need to run

 git fetch origin

to get the updated branch information.

Running

 git branch -a

will show all the remote origin branches (origin/*) that your local repository currently knows about.

Developing against master

To start local development using the Insoshi master branch as the starting point:

  git branch <localdev> origin/master
  git checkout <localdev>

To update a local development branch with the latest official Insoshi updates:

  git fetch origin
  git rebase origin/master

Developing against edge

To start local development using the Insoshi edge branch as the starting point:

  git branch <localdev> origin/edge
  git checkout <localdev>

To update a local development branch with the latest official Insoshi updates on edge:

  git fetch origin
  git rebase origin/edge

You should also be able to use the rebase command to switch an existing local development branch from running on against master to edge:

  git checkout <existing_localdev>
  git fetch origin
  git rebase origin/edge

(Going in reverse from edge to master can be more complicated depending on the features/fixes currently on edge and your local development.)

The process outlined in Pushing up Your Changes remains the same no matter if you've started from master or edge.