如何合并到我的git？

Question

我想要merge

分支jb-mr1-release

我的git分支是jellybean

如何从Android googlesource合并到jellybean？

Answer 1

也许这个

git remote add upstream https://android.googlesource.com/platform/frameworks/base
git checkout jellybean
git fetch upstream
git merge upstream/jb-mr1-release

ref