如何保持forked repo同步到原始repo

Question

Github说，"This branch is 10 commits ahead, 8 commits behind xyz:master"。

如何与主人合作？

Answer 1

将master拉入您的分支（say, feature）然后解决＆＃34; 8提交＆＃34;。如果您将feature与master合并，那么＆＃34; 10提前提交＆＃34;会解决的。

# merge 'master' into 'feature' branch (solve '8 commits behind')

$ git fetch
$ git checkout feature 
$ git pull origin master         # pull latest commits of master
$ git push origin HEAD           # update remote/feature

# merge 'feature' into 'master' branch (solve '10 commits ahead')

$ git checkout master            # checkout 'master'  
$ git pull origin master         # sync with origin/master
$ git pull origin feature        # pull latest commits of your branch 'feature'
$ git push origin master         # push to remote/master

Answer 2

将两个分支合并在一起