Created
July 4, 2012 14:23
-
-
Save nfreear/3047619 to your computer and use it in GitHub Desktop.
How to use the subtree merge strategy - Nick's mods for Drupal 6.x-based E-PD
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # http://kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html | |
| $ git remote add -f feedsProject --no-tags -t 6.x-1.x http://git.drupal.org/project/feeds.git | |
| $ git merge -s ours --no-commit feedsProject/6.x-1.x <2> | |
| $ git read-tree --prefix=sites/all/modules/contrib/feeds/ -u feedsProject/6.x-1.x <3> | |
| $ git commit -m "Merge remote-tracking branch 'feedsProject/6.x-1.x'.." <4> | |
| $ git pull -s subtree feedsProject 6.x-1.x <5> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Can you not source tags for modules? e.g. install feeds 6.x-1.0, bump to 6.x-1.1, etc? As if one were working with released zipballs ...