如何合並到我的git？

Question

我想合並

分支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