git: Updating my fork and rebase

Question

This is the situation:

repo    upstream     upstreamfork      myfork_from_upstreamfork
branch   master         testing             mybranch
           |
           |
           |-------------->|
                           |------------------->|
                           |
                           |

upstreamfork has new commits. I need to update mybranch from myfork_from_upstreamfork with the latest commits from upstreamfork/testing

I tried git rebase upstreamfork/testing from mybranch, but I get

Current branch mybranch is up to date.

How do I correctly update my branch?

I am starting fresh on this project. Eventually I will issue PRs for upstreamfork - which may well be integrated into upstream at some point - so I don't want to mess up :shiver

Possible duplicate of [How to rebase local branch with remote master](http://stackoverflow.com/questions/7929369/how-to-rebase-local-branch-with-remote-master) — Scott Weldon, Feb 08 '17 at 00:59

score 0 · Answer 1 · edited May 23 '17 at 10:29

0

This question has the answer: How to rebase local branch with remote master

needed to first fetch testing from upstreamfork. After that, git rebase upstreamfork/testing worked just fine

edited May 23 '17 at 10:29

Community

1
1

answered Feb 07 '17 at 22:33

transient_loop

5,984
15
58
117

git: Updating my fork and rebase

1 Answers1