A quick glance at your command line and the man page for git rebase
suggests the problem was you didn't actually use --onto. I believe the
correct command would be:
git rebase --onto dev stable topicA
That should start by determining which commits are one topicA but not
stable and then checkout
Mandeep Sandhu:
Here's what I did when I was in topicA:
$ git rebase dev stable topicA
(this was suggested in the manpage as well).
I guess you also had an --onto in there, as the above would throw a
syntax error. As long as the branches are in order, I cannot see how
that wouldn't do what
$ git rebase dev stable topicA
(this was suggested in the manpage as well).
I guess you also had an --onto in there, as the above would throw a syntax
error. As long as the branches are in order, I cannot see how that wouldn't
do what you wanted.
Yes, you're right. There was --onto there.
On Tue, Oct 22, 2013 at 11:30 AM, Bryan Turner btur...@atlassian.com wrote:
A quick glance at your command line and the man page for git rebase
suggests the problem was you didn't actually use --onto. I believe the
correct command would be:
git rebase --onto dev stable topicA
Yes, thats the
Thanks for the link.
I too tried doing a rebase with --onto, though as I said, I was
getting a lot of conflicts while doing it.
So cherry-picking my 2 commits was the solution that worked. I had
also screwed up my topic branch by doing different combo's of this cmd
and using --set-upstream-to
Mandeep Sandhu mandeepsandhu@gmail.com writes:
Hi All,
I'm in a bit of a pickle! :) So I've come to ask for help from the guru's
here.
My story is not unique but somehow the various suggested solutions
don't seem to work in my case.
* I was working on a feature which was supposed to
Hi All,
I'm in a bit of a pickle! :) So I've come to ask for help from the guru's here.
My story is not unique but somehow the various suggested solutions
don't seem to work in my case.
* I was working on a feature which was supposed to be done off our
'dev' branch. But instead I forgot and
7 matches
Mail list logo