Skip to content

Instantly share code, notes, and snippets.

@stevekuznetsov
Created February 17, 2016 18:38
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save stevekuznetsov/56a035d5e611356169ce to your computer and use it in GitHub Desktop.
Save stevekuznetsov/56a035d5e611356169ce to your computer and use it in GitHub Desktop.
error
$ UPSTREAM_REMOTE=upstream hack/cherry-pick.sh 21265
++ Generating patch for 22ad56ddeda7bfd71714ab12b721c28336028987...49f1193126b92158ee089a7bcf91fca7ff6956e5 onto f0cd09a ...
fatal: Cannot update paths and switch to branch 'last_upstream_branch' at the same time.
Did you intend to checkout 'f0cd09a' which can not be resolved as commit?
!!! Error in hack/cherry-pick.sh:51
'git checkout -b last_upstream_branch "${lastrev}"' exited with status 128
Call stack:
1: hack/cherry-pick.sh:51 main(...)
Exiting with status 1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment