Rebasing and merging

Let say we are merging the branch life0.1 into the branch master. This means that master will have everything life0.1 has now. So you are effectively making master identical to life0.1.

Here we are starting the rebasing process with a repository life0.1 thatwas a branch off life_devo. The repository had changes that occurred so it was different than life_devo. Life_devo was based on master, but life0.1 was based on life_devo. After rebasing life0.1 will be based on master.

$ git checkout life0.1

$ git rebase master This will change the base of life0.1 to be master.

$ git checkout master We assume no conflicts between these two branches, if there were conficlcs it would have been more complicated, ask around...

$ git push origin master This will update all the changes to the onine repository.