Question

When trying to rebase a feature branch onto master, I get the following error:

The situation I’m in is almost exactly the situation described in the manual where it talks about transplanting a topic onto master.

o---o---o---o---o  master
     \
     o---o---o---o---o  next (telephony)
                  \
                   o---o---o  topic (ivr)

The situation is slightly different in that next has already been merged into master.

I want to transplant ivr onto master, but when I do I get the error:

dhcp-156:gitrepos barry$ git rebase --onto origin/master telelphony ivr
fatal: Needed a single revision
invalid upstream telelphony

Which looks like it can’t find the telephony branch?

Answer 1

If you want the telephony branch you need to say telephony, not telelphony.