resolve #236, resolve #237: git hack/extract - branch exists on remote

@kevgo
I don't think you need the "remote main commit" and "feature commit" commits in this spec.