How to rebase git branch onto indirect parent branch when direct parent is merged

Asked Sep 08 '21 at 15:13

Active Sep 08 '21 at 16:32

Viewed 25 times

I have a feature branch say branch A and from A I have created branch B, later created branch C from B. Branch B got some more commits and got merged into branch A. I want to rebase branch C on branch A.

Pictorial representation:

Actual scenario

Expecting:

How do I achieve this? I've tried:

git rebase A when on C
git rebase --onto A B C

In both cases when I try to do git push I'm getting error:

! [rejected]            C -> C (non-fast-forward)<br/>
error: failed to push some refs to 'https://github.com/repo/myRepo.git'

edited Sep 08 '21 at 16:32

phd

82,685
13
120
165

asked Sep 08 '21 at 15:13

Diksha

https://stackoverflow.com/search?q=%5Bgit-push%5D+non-fast-forward – phd Sep 08 '21 at 16:33
1

`git push --force origin C` – phd Sep 08 '21 at 16:34
@phd thanks it got resolved! – Diksha Sep 08 '21 at 16:43

How to rebase git branch onto indirect parent branch when direct parent is merged

0 Answers0