如何合并从另一个分支分叉的分支？ （为了从原始分支获取最新提交）

Question

I own a rock960 model c by 96boards and their kernel github repository (96rocks) is forked from rockchip-linux kernel one...

How do i do to merge 96rocks 'release-4.4-rock960' branch into rockchip-linux 'stable-4.4-rk3399-linux' ?

When i compare these two branches through github UI , it's telling me that they are not automatically mergeables...

Answer 1

So the goal is, they are behind the repo they are forked from, and you'd like your own copy to be up to date? Clone the https://github.com/96rocks/kernel repository to your own machine; it is now your origin remote. Now, on your own machine, add the https://github.com/rockchip-linux/kernel as another remote; name it upstream (that is conventional). Now you can fetch from upstream and merge into your local branch that comes from origin .