Changed git commands used for sync, should deal with forced commits better now