从workspaceA中merge某个cr到workspaceB中:
cd workspaceB/<framework/base-as-example>
git fetch path/to/worksapceA/<framework/base-as-example> refs/tags/<a-tagname-of-framework/base>
git checkout FETCH_HEAD -b temp
git checkout your-destinate-branch-to-merge
git cherry-pick <the commid-id you want to merge>
get mergetool -t meld #resolve conflict when cherry-pick
从workspaceA中merge某个branch到workspaceB中:
cd workspaceB/<framework/base-as-example>
git fetch path/to/worksapceA/<framework/base-as-example> <src-branch-name>
git checkout FETCH_HEAD -b temp
git merge temp