From https://code.google.com/p/ardupilot-mega
   28bb6fd..c5f0dc1  APM_Camera -> origin/APM_Camera
   8905f63..112b274  master     -> origin/master
error: Your local changes to 'ArduPlane/APM_Config.h' would be overwritten by merge.  Aborting.
Please, commit your changes or stash them before you can merge.
Updating 8905f63..112b274