How to do when I want to upgrade my project version using git (rebase or merge)?

Question

Please forgive me if I didn't express it clearly in the title.

I have one project which is cloned from upstream. And now it is 1.5 in our branch without lots of our in house commits on it. Now the upstream will release 1.6, and we'd like to upgrade 1.6 too but keep our changes. In this case what should I do ? Thanks

Answer 1

There are many ways of doing it, but one of the simplest way is in below steps:

1. Add upstream to your repo using below command:

git remote add upstream < upstream url >

2. Then fetch your upstream to your local, with the below command

git fetch upstream

3. Now create a local branch with the HEAD of your current branch, using below command:

git checkout -b new_branch

4. Then choose the commit-id of upstream version 1.6, and start the rebase operation to update your new_branch to version 1.6.

git rebase --autosquash --interactive commit-id

It will play all your local patches to the upstream 1.6 version code. Resolve the conflicts and you have now a new_branch with version 1.6 along with your local changes.