Question

one month ago i started working on a new function on one of our private repositories on github. I cloned the repository and branched it. I’ve been working on the branch ever since.

In the meantime the code was moved to a different repository on github. Now i need to merge what i’ve done with the new developments that have been going on in the new one.

My idea:

1 – checkout the new repository.

2 – Find the last common commit in my repository and the new one. This should be the last commit on the master branch.

3 – Create a patch between the master branch and my working branch.

4 – Apply the patch to the new repository.

Is this correct? What should be the git commands to do 3 and 4 ?

Answer 1

git-rebase should do what you want, i.e. replay your changes onto the new repo:

git remote add new-repo /path/to/new-repo
git fetch new-repo
git checkout hacking-branch
git rebase hacking-branch new-repo/master