rebase fails [message #754105] |
Mon, 31 October 2011 18:53 |
Bit2_Gosu Messages: 6 Registered: October 2011 |
Junior Member |
|
|
Hi!
I have a master branch. I then created a new branch called "gummis". I made a fiew commits in "gummis" and one commit in "master" after creation of "gummis".
Currently i have "gummis" checked out and in repository view I clicked on "rebase" with target local -> master (in order to include the additonal commit in master branch that was added after creation of "gummis"). However I get the message:
"Can only cherry-pick commits which have exactly one parent".
Firstly I don't fully understand this message. Secondly the last commit in master branch has exactly one parent. What did I do wrong?
[Updated on: Mon, 31 October 2011 18:54] Report message to a moderator
|
|
|
|
Powered by
FUDForum. Page generated in 0.01602 seconds