2 years ago I had forked a git repository. After that we made some changes on our side not much but we have changed little things in many files. 

Now there are some fixes+features in base git repo from which we had forked. Since now we want to include those changes to our forked one, by keeping our local changes constant. 

Is there any way to merge latest repo changes to our forked repo keeping our local changes as it is?