Using Git how to merge a subtree from remote branch
Subtrees in Git work nicely although some git commands remain to be supported for subtrees.
Here's the question:
How to make the subtree pull from a different remote branch like "stable" or "integrate"?
FYI, we have a subtree "push"
working as a script. In fact, it can even push the subtree to the specific branch of our choice on the remote repository.
Does anybody know how to do the reverse on a pull or even have a clue?
The simple pull works like this:
git pull -s subtree remotebranch
One idea that can be tried: Maybe a 2-step process will do the trick.
- The remote branch开发者_StackOverflow中文版 gets pulled from remote repository branch like "
stable
" and then - do the
git subtree pull
tomaster
?
Sincerely, Wayne
May be (not tested) the git subtree script tool may help here.
See its man page
It can merge/pull a subproject in your own repo, but it may concern all branches, so your two-step process could still be needed.
精彩评论