How to merge remote master to local branch

Question

I have a local branch of a project (\"configUpdate\") that I\'ve forked from somebody else\'s project and I\'ve done a load of changes on it and would like to merge the changes

Answer 1

Switch to your local branch

> git checkout configUpdate

Merge remote master to your branch

> git rebase master configUpdate

In case you have any conflicts, correct them and for each conflicted file do the command

> git add [path_to_file/conflicted_file] (e.g. git add app/assets/javascripts/test.js)

Continue rebase

> git rebase --continue