github上如何合并别人的pull request

 

https://github.com/Epix37/Hearthstone-Deck-Tracker/issues/1391

I fetch the code from your repository,
loop the following steps

step1: create a branch on the last commit of the third party,and swicth to the new branch

step2:rebase the new branch onto master

step3:checkout back to the master,then merge new branch[no fastword]
then git log graph like this :

 

在别人的提交请求的最后一个commit上,创建分支temp

切换到temp分支

然后在这个分支上git rebase mater

切换到master然后 git merge temp

 

posted @ 2015-10-19 22:56  ChuckLu  阅读(3622)  评论(0编辑  收藏  举报