tags:

views:

49

answers:

1

Hi,

Consider this part of a repository of mine:

/
 myproject
 django -> django/master (django/django @github)
 ... other dependencies

django is a subtree that I merged following this howto: How to use the subtree merge strategy

Now I found out that another dependency is incompatible with the current master of django and I want to switch to django/1.1.x for that reason. How do I do this?

Thanks in advance.

+2  A: 

A submodule merely points at a commit. Check out the proper commit, and add it to the parent module, and commit in the parent.

Randal Schwartz
I'm using subtrees (not submodules) - so I don't think it'll work like this.
Till Backhaus
Ahh, what you'll have to do then is go back to the commit before your subtree commit, then merge in the new django, then replay all your commits on top of that (using `git rebase -i` and ignoring the commit that brought the other django in).
Randal Schwartz
thank you Randal
Till Backhaus