Git merge fork commits into master origin

Still new to Git. Someone made a fork of my repository, added commits and would like to merge commits to my original repository origin and branch master. That is why I see:
"person x" wants someone to merge 6 commits into "my account":master from "person x":nltranslate
How do i do that?
rhandalthorAsked:
Who is Participating?
 
rhandalthorConnect With a Mentor Author Commented:
Well at freenode github I learned that:
git checkout master
git pull git://github.com/arendjantetteroo/OSTicket-Reloaded.git nltranslate
git push origin master

Open in new window


works just as well
0
 
rhandalthorAuthor Commented:
Arend made some Dutch translation changes for which he asked a pulls with to commits to be merged. See: https://github.com/jasperf/OSTicket-Reloaded/pull/21 I would like to merge/commit these two commits. Do I do this by:

git checkout master
git remote add arendjantetteroo git://github.com/arendjantetteroo/OSTicket-Reloaded.git
git fetch arendjantetteroo
git merge arenjantetteroo/nltranslate
git push origin master

?
or is there a better way?
0
 
rhandalthorAuthor Commented:
Couldn't wait anymore so seeked out help at IRC Freenode Github and got my question answered.
0
Question has a verified solution.

Are you are experiencing a similar issue? Get a personalized answer when you ask a related question.

Have a better answer? Share it in a comment.

All Courses

From novice to tech pro — start learning today.